From 71d573cae0b6bf2e171de84e918029b53cc072e7 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Tue, 27 Nov 2012 00:48:12 +0000 Subject: [PATCH] fix permissions small repackaging on command related classes into future package structure of org.mifosplatform --- .../platform/api/ClientsApiResource.java | 6 +- .../platform/api/RolesApiResource.java | 6 +- .../platform/api/UsersApiResource.java | 2 +- .../platform/api/data/EntityIdentifier.java | 59 ++++++++++--------- ...GsonPortfolioApiJsonSerializerService.java | 2 +- .../PortfolioApiJsonSerializerService.java | 2 +- .../service/CommandSourceHandler.java | 5 -- .../PortfolioMakerCheckerWriteService.java | 10 ---- .../mifosng/platform/user/domain/AppUser.java | 10 +++- .../user/domain/PlatformUserRepository.java | 2 +- .../commands}/api/CommandsApiResource.java | 20 +++---- .../commands}/api/data/CommandSourceData.java | 2 +- .../commands}/domain/CommandSource.java | 2 +- .../domain/CommandSourceRepository.java | 2 +- .../handler}/ClientCommandHandler.java | 5 +- .../handler/CommandSourceHandler.java | 5 ++ .../CommandSourceHandlerDelegator.java | 4 +- .../commands/handler}/RoleCommandHandler.java | 5 +- .../commands/handler}/UserCommandHandler.java | 5 +- .../service/ChangeDetectionService.java | 2 +- .../service/ChangeDetectionServiceJdbc.java | 2 +- ...olioCommandSourceWritePlatformService.java | 2 +- ...ortfolioCommandSourceWriteServiceImpl.java | 8 ++- .../PortfolioCommandsReadPlatformService.java | 4 +- ...tfolioCommandsReadPlatformServiceImpl.java | 4 +- .../resources/META-INF/spring/appContext.xml | 4 +- 26 files changed, 92 insertions(+), 88 deletions(-) delete mode 100644 mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/CommandSourceHandler.java delete mode 100644 mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioMakerCheckerWriteService.java rename mifosng-provider/src/main/java/org/{mifosng/platform => mifosplatform/infrastructure/commands}/api/CommandsApiResource.java (80%) rename mifosng-provider/src/main/java/org/{mifosng/platform => mifosplatform/infrastructure/commands}/api/data/CommandSourceData.java (94%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/domain/CommandSource.java (98%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/domain/CommandSourceRepository.java (83%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker/service => mifosplatform/infrastructure/commands/handler}/ClientCommandHandler.java (96%) create mode 100644 mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandler.java rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker/service => mifosplatform/infrastructure/commands/handler}/CommandSourceHandlerDelegator.java (95%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker/service => mifosplatform/infrastructure/commands/handler}/RoleCommandHandler.java (97%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker/service => mifosplatform/infrastructure/commands/handler}/UserCommandHandler.java (97%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/service/ChangeDetectionService.java (71%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/service/ChangeDetectionServiceJdbc.java (97%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/service/PortfolioCommandSourceWritePlatformService.java (84%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/service/PortfolioCommandSourceWriteServiceImpl.java (88%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/service/PortfolioCommandsReadPlatformService.java (69%) rename mifosng-provider/src/main/java/org/{mifosng/platform/makerchecker => mifosplatform/infrastructure/commands}/service/PortfolioCommandsReadPlatformServiceImpl.java (96%) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java index 8fc448abe..faf38b98a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java @@ -26,7 +26,6 @@ import org.apache.commons.lang.StringUtils; import org.mifosng.platform.api.commands.NoteCommand; import org.mifosng.platform.api.data.ClientAccountSummaryCollectionData; import org.mifosng.platform.api.data.ClientData; -import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.NoteData; import org.mifosng.platform.api.data.OfficeLookup; @@ -39,10 +38,11 @@ import org.mifosng.platform.exceptions.ImageNotFoundException; import org.mifosng.platform.infrastructure.Base64EncodedImage; import org.mifosng.platform.infrastructure.FileUtils; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; -import org.mifosng.platform.makerchecker.service.PortfolioCommandSourceWritePlatformService; -import org.mifosng.platform.makerchecker.service.PortfolioCommandsReadPlatformService; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; +import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; +import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.infrastructure.commands.service.PortfolioCommandsReadPlatformService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java index 3f0f04420..4c4d975ac 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/RolesApiResource.java @@ -19,7 +19,6 @@ import javax.ws.rs.core.UriInfo; import org.mifosng.platform.api.commands.RoleCommand; import org.mifosng.platform.api.commands.RolePermissionCommand; -import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.PermissionUsageData; import org.mifosng.platform.api.data.RoleData; @@ -27,11 +26,12 @@ import org.mifosng.platform.api.data.RolePermissionsData; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerService; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; -import org.mifosng.platform.makerchecker.service.PortfolioCommandSourceWritePlatformService; -import org.mifosng.platform.makerchecker.service.PortfolioCommandsReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.service.PermissionReadPlatformService; import org.mifosng.platform.user.service.RoleReadPlatformService; +import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; +import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.infrastructure.commands.service.PortfolioCommandsReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/UsersApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/UsersApiResource.java index 30bda3847..86d45123c 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/UsersApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/UsersApiResource.java @@ -23,10 +23,10 @@ import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.data.OfficeLookup; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; -import org.mifosng.platform.makerchecker.service.PortfolioCommandSourceWritePlatformService; import org.mifosng.platform.organisation.service.OfficeReadPlatformService; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.service.AppUserReadPlatformService; +import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EntityIdentifier.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EntityIdentifier.java index 8af2bc21c..643674248 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EntityIdentifier.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/EntityIdentifier.java @@ -5,36 +5,39 @@ package org.mifosng.platform.api.data; */ public class EntityIdentifier { - private Long entityId; - @SuppressWarnings("unused") - private Long makerCheckerId; + private Long entityId; - public static EntityIdentifier makerChecker(final Long makerCheckerId) { - return new EntityIdentifier(null, makerCheckerId); - } - - public static EntityIdentifier makerChecker(final Long resourceId, final Long makerCheckerId) { - return new EntityIdentifier(resourceId, makerCheckerId); - } - - public EntityIdentifier() { - // - } + // TODO - Rename variable to commandId or taskId or something that shows + // this is the id of a command in a table/queue for processing. + @SuppressWarnings("unused") + private Long makerCheckerId; - public EntityIdentifier(final Long entityId) { - this.entityId = entityId; - } - - private EntityIdentifier(final Long entityId, final Long makerCheckerId) { - this.entityId = entityId; - this.makerCheckerId = makerCheckerId; - } + public static EntityIdentifier makerChecker(final Long makerCheckerId) { + return new EntityIdentifier(null, makerCheckerId); + } - public Long getEntityId() { - return this.entityId; - } + public static EntityIdentifier makerChecker(final Long resourceId, final Long makerCheckerId) { + return new EntityIdentifier(resourceId, makerCheckerId); + } - public void setEntityId(final Long entityId) { - this.entityId = entityId; - } + public EntityIdentifier() { + // + } + + public EntityIdentifier(final Long entityId) { + this.entityId = entityId; + } + + private EntityIdentifier(final Long entityId, final Long makerCheckerId) { + this.entityId = entityId; + this.makerCheckerId = makerCheckerId; + } + + public Long getEntityId() { + return this.entityId; + } + + public void setEntityId(final Long entityId) { + this.entityId = entityId; + } } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java index e2be4d4cc..96c008fe0 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonPortfolioApiJsonSerializerService.java @@ -14,7 +14,6 @@ import org.mifosng.platform.api.data.ClientAccountSummaryCollectionData; import org.mifosng.platform.api.data.ClientData; import org.mifosng.platform.api.data.ClientIdentifierData; import org.mifosng.platform.api.data.CodeData; -import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.api.data.ConfigurationData; import org.mifosng.platform.api.data.DatatableData; import org.mifosng.platform.api.data.DepositAccountData; @@ -42,6 +41,7 @@ import org.mifosng.platform.api.data.SavingAccountData; import org.mifosng.platform.api.data.SavingProductData; import org.mifosng.platform.api.data.StaffData; import org.mifosng.platform.infrastructure.api.GoogleGsonSerializerHelper; +import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java index c4735fbe3..9e3446692 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiJsonSerializerService.java @@ -12,7 +12,6 @@ import org.mifosng.platform.api.data.ClientAccountSummaryCollectionData; import org.mifosng.platform.api.data.ClientData; import org.mifosng.platform.api.data.ClientIdentifierData; import org.mifosng.platform.api.data.CodeData; -import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.api.data.ConfigurationData; import org.mifosng.platform.api.data.DatatableData; import org.mifosng.platform.api.data.DepositAccountData; @@ -39,6 +38,7 @@ import org.mifosng.platform.api.data.RolePermissionsData; import org.mifosng.platform.api.data.SavingAccountData; import org.mifosng.platform.api.data.SavingProductData; import org.mifosng.platform.api.data.StaffData; +import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; public interface PortfolioApiJsonSerializerService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/CommandSourceHandler.java b/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/CommandSourceHandler.java deleted file mode 100644 index 2aad99075..000000000 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/CommandSourceHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.mifosng.platform.makerchecker.service; - -public interface CommandSourceHandler { - -} diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioMakerCheckerWriteService.java b/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioMakerCheckerWriteService.java deleted file mode 100644 index 26a7799d4..000000000 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioMakerCheckerWriteService.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.mifosng.platform.makerchecker.service; - - -public interface PortfolioMakerCheckerWriteService { -//TODO - permissions on this to be done after development completes - - Long logNewEntry(String taskName, String taskJson); - - Long approveEntry(Long id); -} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java index b1f587e5d..814426ec6 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java @@ -357,10 +357,14 @@ public class AppUser extends AbstractAuditableCustom implements P return getId().equals(userId); } - private boolean hasAnyPermission(final List requiredPermissions) { + private boolean hasNotAnyPermission(final List permissions) { + return !hasAnyPermission(permissions); + } + + private boolean hasAnyPermission(final List permissions) { boolean hasAtLeastOneOf = false; - for (final String permissionCode : requiredPermissions) { + for (final String permissionCode : permissions) { if (hasPermissionTo(permissionCode)) { hasAtLeastOneOf = true; break; @@ -371,7 +375,7 @@ public class AppUser extends AbstractAuditableCustom implements P } public void validateHasPermissionTo(final String function, final List allowedPermissions) { - if (hasAnyPermission(allowedPermissions)) { + if (hasNotAnyPermission(allowedPermissions)) { final String authorizationMessage = "User has no authority to: " + function; throw new NoAuthorizationException(authorizationMessage); } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PlatformUserRepository.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PlatformUserRepository.java index cd064e296..1acec101b 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PlatformUserRepository.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/PlatformUserRepository.java @@ -4,6 +4,6 @@ import org.mifosng.platform.infrastructure.PlatformUser; public interface PlatformUserRepository { - PlatformUser findByUsername(String username); + PlatformUser findByUsername(String username); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/CommandsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/CommandsApiResource.java similarity index 80% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/CommandsApiResource.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/CommandsApiResource.java index 361713fe6..b2e116b51 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/CommandsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/CommandsApiResource.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api; +package org.mifosplatform.infrastructure.commands.api; import java.util.Collection; import java.util.Set; @@ -17,13 +17,13 @@ import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; import org.mifosng.platform.api.data.EntityIdentifier; -import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.exceptions.UnrecognizedQueryParamException; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.security.PlatformSecurityContext; -import org.mifosng.platform.makerchecker.service.PortfolioCommandsReadPlatformService; -import org.mifosng.platform.makerchecker.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; +import org.mifosplatform.infrastructure.commands.service.PortfolioCommandSourceWritePlatformService; +import org.mifosplatform.infrastructure.commands.service.PortfolioCommandsReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -62,15 +62,15 @@ public class CommandsApiResource { } @POST - @Path("{makerCheckerId}") + @Path("{commandId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public String approveMakerCheckerEntry(@PathParam("makerCheckerId") final Long makerCheckerId, + public String approveMakerCheckerEntry(@PathParam("commandId") final Long commandId, @QueryParam("command") final String commandParam) { EntityIdentifier result = null; if (is(commandParam, "approve")) { - result = this.writePlatformService.approveEntry(makerCheckerId); + result = this.writePlatformService.approveEntry(commandId); } else { throw new UnrecognizedQueryParamException("command", commandParam); } @@ -83,12 +83,12 @@ public class CommandsApiResource { } @DELETE - @Path("{makerCheckerId}") + @Path("{commandId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public String deleteMakerCheckerEntry(@PathParam("makerCheckerId") final Long makerCheckerId) { + public String deleteMakerCheckerEntry(@PathParam("commandId") final Long commandId) { - final Long id = this.writePlatformService.deleteEntry(makerCheckerId); + final Long id = this.writePlatformService.deleteEntry(commandId); return this.apiJsonSerializerService.serializeEntityIdentifier(EntityIdentifier.makerChecker(id)); } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/CommandSourceData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/data/CommandSourceData.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/data/CommandSourceData.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/data/CommandSourceData.java index 3c24f8271..b06f42e19 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/CommandSourceData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/api/data/CommandSourceData.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.data; +package org.mifosplatform.infrastructure.commands.api.data; import org.joda.time.LocalDate; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/domain/CommandSource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSource.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/domain/CommandSource.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSource.java index 87a994034..725b0b7fe 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/domain/CommandSource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSource.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.domain; +package org.mifosplatform.infrastructure.commands.domain; import java.util.Date; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/domain/CommandSourceRepository.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSourceRepository.java similarity index 83% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/domain/CommandSourceRepository.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSourceRepository.java index d0446fce8..26b0a0e13 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/domain/CommandSourceRepository.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/domain/CommandSourceRepository.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.domain; +package org.mifosplatform.infrastructure.commands.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ClientCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/ClientCommandHandler.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ClientCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/ClientCommandHandler.java index 94c69d94d..a2960781e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ClientCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/ClientCommandHandler.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.handler; import java.util.Arrays; import java.util.List; @@ -10,9 +10,10 @@ import org.mifosng.platform.api.infrastructure.PortfolioApiDataConversionService import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.client.service.ClientWritePlatformService; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; -import org.mifosng.platform.makerchecker.domain.CommandSource; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.commands.domain.CommandSource; +import org.mifosplatform.infrastructure.commands.service.ChangeDetectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandler.java new file mode 100644 index 000000000..f82a30325 --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandler.java @@ -0,0 +1,5 @@ +package org.mifosplatform.infrastructure.commands.handler; + +public interface CommandSourceHandler { + +} diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/CommandSourceHandlerDelegator.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandlerDelegator.java similarity index 95% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/CommandSourceHandlerDelegator.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandlerDelegator.java index 1e5c772fd..b01fe7aec 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/CommandSourceHandlerDelegator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/CommandSourceHandlerDelegator.java @@ -1,8 +1,8 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.handler; import org.mifosng.platform.infrastructure.errorhandling.UnsupportedCommandException; -import org.mifosng.platform.makerchecker.domain.CommandSource; import org.mifosng.platform.security.PlatformSecurityContext; +import org.mifosplatform.infrastructure.commands.domain.CommandSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/RoleCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/RoleCommandHandler.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/RoleCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/RoleCommandHandler.java index 52a288c79..42621a936 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/RoleCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/RoleCommandHandler.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.handler; import java.util.Arrays; import java.util.List; @@ -11,10 +11,11 @@ import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerServi import org.mifosng.platform.api.infrastructure.PortfolioCommandSerializerService; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; import org.mifosng.platform.infrastructure.errorhandling.UnsupportedCommandException; -import org.mifosng.platform.makerchecker.domain.CommandSource; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.service.RoleWritePlatformService; +import org.mifosplatform.infrastructure.commands.domain.CommandSource; +import org.mifosplatform.infrastructure.commands.service.ChangeDetectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/UserCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/UserCommandHandler.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/UserCommandHandler.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/UserCommandHandler.java index d58df011d..69052d4ad 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/UserCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/handler/UserCommandHandler.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.handler; import java.util.Arrays; import java.util.List; @@ -9,10 +9,11 @@ import org.mifosng.platform.api.infrastructure.PortfolioApiDataConversionService import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerService; import org.mifosng.platform.api.infrastructure.PortfolioCommandSerializerService; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; -import org.mifosng.platform.makerchecker.domain.CommandSource; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; import org.mifosng.platform.user.service.AppUserWritePlatformService; +import org.mifosplatform.infrastructure.commands.domain.CommandSource; +import org.mifosplatform.infrastructure.commands.service.ChangeDetectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ChangeDetectionService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionService.java similarity index 71% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ChangeDetectionService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionService.java index 0f367d445..11a117a66 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ChangeDetectionService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.service; public interface ChangeDetectionService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ChangeDetectionServiceJdbc.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionServiceJdbc.java similarity index 97% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ChangeDetectionServiceJdbc.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionServiceJdbc.java index bf3592d86..5d0c8f3ea 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/ChangeDetectionServiceJdbc.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/ChangeDetectionServiceJdbc.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.service; import org.mifosng.platform.api.commands.ClientCommand; import org.mifosng.platform.api.data.ClientData; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandSourceWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWritePlatformService.java similarity index 84% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandSourceWritePlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWritePlatformService.java index 071178a2d..c95cfa3b3 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandSourceWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWritePlatformService.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.service; import org.mifosng.platform.api.data.EntityIdentifier; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandSourceWriteServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWriteServiceImpl.java similarity index 88% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandSourceWriteServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWriteServiceImpl.java index 3cbc4fc20..58f15f670 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandSourceWriteServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandSourceWriteServiceImpl.java @@ -1,15 +1,17 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.service; import org.joda.time.LocalDate; import org.mifosng.platform.api.data.EntityIdentifier; -import org.mifosng.platform.makerchecker.domain.CommandSource; -import org.mifosng.platform.makerchecker.domain.CommandSourceRepository; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosng.platform.user.domain.AppUser; +import org.mifosplatform.infrastructure.commands.domain.CommandSource; +import org.mifosplatform.infrastructure.commands.domain.CommandSourceRepository; +import org.mifosplatform.infrastructure.commands.handler.CommandSourceHandlerDelegator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +// TODO RENAME SO matches interface name @Service public class PortfolioCommandSourceWriteServiceImpl implements PortfolioCommandSourceWritePlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandsReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformService.java similarity index 69% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandsReadPlatformService.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformService.java index 0b6fb3024..7ced78bde 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandsReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformService.java @@ -1,8 +1,8 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.service; import java.util.Collection; -import org.mifosng.platform.api.data.CommandSourceData; +import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; public interface PortfolioCommandsReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandsReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformServiceImpl.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandsReadPlatformServiceImpl.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformServiceImpl.java index 899f73eaa..e2fe29a36 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/makerchecker/service/PortfolioCommandsReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/commands/service/PortfolioCommandsReadPlatformServiceImpl.java @@ -1,14 +1,14 @@ -package org.mifosng.platform.makerchecker.service; +package org.mifosplatform.infrastructure.commands.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.joda.time.LocalDate; -import org.mifosng.platform.api.data.CommandSourceData; import org.mifosng.platform.infrastructure.JdbcSupport; import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource; import org.mifosng.platform.security.PlatformSecurityContext; +import org.mifosplatform.infrastructure.commands.api.data.CommandSourceData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml index 25264fdae..22128b0ba 100644 --- a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml +++ b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml @@ -16,7 +16,8 @@ + org.mifosng.platform.*.domain, org.mifosng.platform, + org.mifosplatform.*.*.service, org.mifosplatform.*.*.domain, org.mifosplatform"> @@ -24,6 +25,7 @@ +