From 6c98381d94af2b81f85fbdd0a3296664df3ecba8 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Fri, 20 Jul 2012 11:12:08 +0100 Subject: [PATCH] tidy up permissions. --- .../mifosng/platform/api/OfficeTransactionsApiResource.java | 5 ----- .../java/org/mifosng/platform/user/domain/Permission.java | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeTransactionsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeTransactionsApiResource.java index 6cdd3f111..44d206001 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeTransactionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/OfficeTransactionsApiResource.java @@ -15,11 +15,9 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.mifosng.platform.api.commands.BranchMoneyTransferCommand; -import org.mifosng.platform.api.data.AppUserData; import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.OfficeTransactionData; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; -import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.api.infrastructure.ApiParameterHelper; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.organisation.service.OfficeWritePlatformService; @@ -41,9 +39,6 @@ public class OfficeTransactionsApiResource { @Autowired private ApiDataConversionService apiDataConversionService; - @Autowired - private ApiJSONFormattingService jsonFormattingService; - @GET @Path("template") @Consumes({MediaType.APPLICATION_JSON}) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java index eee79bab1..b6c8fbfc9 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java @@ -22,6 +22,8 @@ public class Permission extends AbstractPersistable { @Column(name = "default_description", nullable = false, length=500) private final String defaultDescription; + // TODO - KW - do we need to retain this concept? + @SuppressWarnings("unused") @Column(name = "group_enum", nullable = false) @Enumerated(EnumType.ORDINAL) private final PermissionGroup permissionGroup;