diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java index 866be4a03..334ea8a8d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/PermissionsApiResource.java @@ -13,13 +13,13 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.mifosng.platform.api.commands.PermissionsCommand; import org.mifosng.platform.api.data.EntityIdentifier; import org.mifosng.platform.api.infrastructure.PortfolioApiDataConversionService; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.infrastructure.api.ApiParameterHelper; import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; +import org.mifosplatform.infrastructure.user.command.PermissionsCommand; import org.mifosplatform.infrastructure.user.service.PermissionReadPlatformService; import org.mifosplatform.infrastructure.user.service.PermissionWritePlatformService; 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 0a45d34ce..acfb42c87 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 @@ -17,8 +17,6 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; 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.EntityIdentifier; import org.mifosng.platform.api.infrastructure.PortfolioApiJsonSerializerService; import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerService; @@ -30,6 +28,8 @@ import org.mifosplatform.commands.service.PortfolioCommandsReadPlatformService; import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData; import org.mifosplatform.infrastructure.user.api.data.RoleData; import org.mifosplatform.infrastructure.user.api.data.RolePermissionsData; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; import org.mifosplatform.infrastructure.user.service.PermissionReadPlatformService; import org.mifosplatform.infrastructure.user.service.RoleReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionService.java index 7450e4497..fb24ca97e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionService.java @@ -24,14 +24,14 @@ import org.mifosng.platform.api.commands.LoanTransactionCommand; import org.mifosng.platform.api.commands.NoteCommand; import org.mifosng.platform.api.commands.OfficeCommand; import org.mifosng.platform.api.commands.OrganisationCurrencyCommand; -import org.mifosng.platform.api.commands.PermissionsCommand; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; import org.mifosng.platform.api.commands.SavingAccountCommand; import org.mifosng.platform.api.commands.SavingProductCommand; import org.mifosng.platform.api.commands.StaffCommand; -import org.mifosng.platform.api.commands.UserCommand; import org.mifosng.platform.api.data.ClientData; +import org.mifosplatform.infrastructure.user.command.PermissionsCommand; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.UserCommand; public interface PortfolioApiDataConversionService { diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionServiceImpl.java index d716abb00..0a1b73797 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioApiDataConversionServiceImpl.java @@ -41,19 +41,19 @@ import org.mifosng.platform.api.commands.LoanTransactionCommand; import org.mifosng.platform.api.commands.NoteCommand; import org.mifosng.platform.api.commands.OfficeCommand; import org.mifosng.platform.api.commands.OrganisationCurrencyCommand; -import org.mifosng.platform.api.commands.PermissionsCommand; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; import org.mifosng.platform.api.commands.SavingAccountCommand; import org.mifosng.platform.api.commands.SavingProductCommand; import org.mifosng.platform.api.commands.StaffCommand; -import org.mifosng.platform.api.commands.UserCommand; import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.api.data.ClientData; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; import org.mifosng.platform.infrastructure.api.JsonParserHelper; import org.mifosng.platform.infrastructure.errorhandling.InvalidJsonException; import org.mifosng.platform.infrastructure.errorhandling.UnsupportedParameterException; +import org.mifosplatform.infrastructure.user.command.PermissionsCommand; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.UserCommand; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.number.NumberFormatter; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeerializerServiceGoogleGson.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeerializerServiceGoogleGson.java index 201bf7a2d..c98890a88 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeerializerServiceGoogleGson.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeerializerServiceGoogleGson.java @@ -4,11 +4,11 @@ import java.util.HashSet; import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.UserCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; import org.mifosng.platform.infrastructure.api.JsonParserHelper; import org.mifosng.platform.infrastructure.errorhandling.InvalidJsonException; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.UserCommand; import org.springframework.stereotype.Service; import com.google.gson.Gson; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeserializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeserializerService.java index 31dc82527..4da5130f4 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeserializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandDeserializerService.java @@ -1,8 +1,8 @@ package org.mifosng.platform.api.infrastructure; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.UserCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.UserCommand; /** * Service for de-serializing JSON for a command into the platforms internal diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerService.java index fc4cc0ec7..d492b41eb 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerService.java @@ -1,8 +1,8 @@ package org.mifosng.platform.api.infrastructure; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.UserCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.UserCommand; /** * Service for serializing commands into another format. diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerServiceJson.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerServiceJson.java index d52292e1a..eb2f5726e 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerServiceJson.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/PortfolioCommandSerializerServiceJson.java @@ -2,10 +2,10 @@ package org.mifosng.platform.api.infrastructure; import java.util.HashSet; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.UserCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; import org.mifosng.platform.infrastructure.api.GoogleGsonSerializerHelper; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.UserCommand; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java index ef5055861..5ab6de2c2 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java @@ -4,8 +4,6 @@ import java.util.Arrays; import java.util.List; import org.joda.time.LocalDate; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; import org.mifosng.platform.api.infrastructure.PortfolioApiDataConversionService; import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerService; import org.mifosng.platform.api.infrastructure.PortfolioCommandSerializerService; @@ -14,6 +12,8 @@ import org.mifosng.platform.infrastructure.errorhandling.UnsupportedCommandExcep import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosplatform.commands.domain.CommandSource; import org.mifosplatform.commands.service.ChangeDetectionService; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; import org.mifosplatform.infrastructure.user.domain.AppUser; import org.mifosplatform.infrastructure.user.service.RoleWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java index 934f87457..965ad0f03 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; import org.joda.time.LocalDate; -import org.mifosng.platform.api.commands.UserCommand; import org.mifosng.platform.api.infrastructure.PortfolioApiDataConversionService; import org.mifosng.platform.api.infrastructure.PortfolioCommandDeserializerService; import org.mifosng.platform.api.infrastructure.PortfolioCommandSerializerService; @@ -12,6 +11,7 @@ import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotAppr import org.mifosng.platform.security.PlatformSecurityContext; import org.mifosplatform.commands.domain.CommandSource; import org.mifosplatform.commands.service.ChangeDetectionService; +import org.mifosplatform.infrastructure.user.command.UserCommand; import org.mifosplatform.infrastructure.user.domain.AppUser; import org.mifosplatform.infrastructure.user.service.AppUserWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/PermissionsCommand.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/PermissionsCommand.java similarity index 92% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/commands/PermissionsCommand.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/PermissionsCommand.java index a71da5cfa..cddfb774a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/PermissionsCommand.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/PermissionsCommand.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.commands; +package org.mifosplatform.infrastructure.user.command; import java.util.Map; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/RoleCommand.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RoleCommand.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/commands/RoleCommand.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RoleCommand.java index 5496fe8e3..a33c1b482 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/RoleCommand.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RoleCommand.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.commands; +package org.mifosplatform.infrastructure.user.command; import java.util.Set; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleCommandValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RoleCommandValidator.java similarity index 94% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleCommandValidator.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RoleCommandValidator.java index d4dbcdc1c..d743fbf62 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RoleCommandValidator.java @@ -1,10 +1,9 @@ -package org.mifosplatform.infrastructure.user.service; +package org.mifosplatform.infrastructure.user.command; import java.util.ArrayList; import java.util.List; import org.mifosng.platform.DataValidatorBuilder; -import org.mifosng.platform.api.commands.RoleCommand; import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/RolePermissionCommand.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RolePermissionCommand.java similarity index 93% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/commands/RolePermissionCommand.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RolePermissionCommand.java index f0a60d193..4031bdf61 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/RolePermissionCommand.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/RolePermissionCommand.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.commands; +package org.mifosplatform.infrastructure.user.command; import java.util.Map; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/UserCommand.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/UserCommand.java similarity index 98% rename from mifosng-provider/src/main/java/org/mifosng/platform/api/commands/UserCommand.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/UserCommand.java index d4b6ec313..058bea96d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/commands/UserCommand.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/UserCommand.java @@ -1,4 +1,4 @@ -package org.mifosng.platform.api.commands; +package org.mifosplatform.infrastructure.user.command; import java.util.Set; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/UserCommandValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/UserCommandValidator.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/UserCommandValidator.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/UserCommandValidator.java index 0fda8b76d..de32fafd8 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/UserCommandValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/command/UserCommandValidator.java @@ -1,10 +1,9 @@ -package org.mifosplatform.infrastructure.user.service; +package org.mifosplatform.infrastructure.user.command; import java.util.ArrayList; import java.util.List; import org.mifosng.platform.DataValidatorBuilder; -import org.mifosng.platform.api.commands.UserCommand; import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.exceptions.PlatformApiDataValidationException; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUser.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUser.java index 03955da85..5a1731add 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUser.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/AppUser.java @@ -16,11 +16,11 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import org.mifosng.platform.api.commands.UserCommand; import org.mifosng.platform.exceptions.NoAuthorizationException; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosng.platform.infrastructure.PlatformUser; import org.mifosng.platform.organisation.domain.Office; +import org.mifosplatform.infrastructure.user.command.UserCommand; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Role.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Role.java index 934139e13..17f090404 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Role.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/domain/Role.java @@ -12,9 +12,9 @@ import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.Table; -import org.mifosng.platform.api.commands.RoleCommand; import org.mifosng.platform.infrastructure.AbstractAuditableCustom; import org.mifosplatform.infrastructure.user.api.data.RoleData; +import org.mifosplatform.infrastructure.user.command.RoleCommand; @Entity @Table(name = "m_role") diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformService.java index 0f47c6eb9..e04e3a82c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformService.java @@ -1,6 +1,6 @@ package org.mifosplatform.infrastructure.user.service; -import org.mifosng.platform.api.commands.UserCommand; +import org.mifosplatform.infrastructure.user.command.UserCommand; public interface AppUserWritePlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java index 502f5d536..f8e5e4936 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/AppUserWritePlatformServiceJpaRepositoryImpl.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.mifosng.platform.api.commands.UserCommand; import org.mifosng.platform.api.data.ApiParameterError; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; import org.mifosng.platform.exceptions.OfficeNotFoundException; @@ -21,6 +20,8 @@ import org.mifosng.platform.infrastructure.PlatformUser; import org.mifosng.platform.organisation.domain.Office; import org.mifosng.platform.organisation.domain.OfficeRepository; import org.mifosng.platform.security.PlatformSecurityContext; +import org.mifosplatform.infrastructure.user.command.UserCommand; +import org.mifosplatform.infrastructure.user.command.UserCommandValidator; import org.mifosplatform.infrastructure.user.domain.AppUser; import org.mifosplatform.infrastructure.user.domain.AppUserRepository; import org.mifosplatform.infrastructure.user.domain.Permission; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java index 499885aaf..ec5211635 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java @@ -1,7 +1,7 @@ package org.mifosplatform.infrastructure.user.service; -import org.mifosng.platform.api.commands.PermissionsCommand; +import org.mifosplatform.infrastructure.user.command.PermissionsCommand; import org.springframework.security.access.prepost.PreAuthorize; public interface PermissionWritePlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java index 7cb0a6533..080ec7c51 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformServiceJpaRepositoryImpl.java @@ -3,9 +3,9 @@ package org.mifosplatform.infrastructure.user.service; import java.util.Collection; import java.util.Map; -import org.mifosng.platform.api.commands.PermissionsCommand; import org.mifosng.platform.exceptions.PermissionNotFoundException; import org.mifosng.platform.security.PlatformSecurityContext; +import org.mifosplatform.infrastructure.user.command.PermissionsCommand; import org.mifosplatform.infrastructure.user.domain.Permission; import org.mifosplatform.infrastructure.user.domain.PermissionRepository; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformService.java index d19c17806..f9b2b33b1 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformService.java @@ -1,7 +1,7 @@ package org.mifosplatform.infrastructure.user.service; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; public interface RoleWritePlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java index 02a1e27b3..ed3fd0d36 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/RoleWritePlatformServiceJpaRepositoryImpl.java @@ -3,12 +3,13 @@ package org.mifosplatform.infrastructure.user.service; import java.util.Collection; import java.util.Map; -import org.mifosng.platform.api.commands.RoleCommand; -import org.mifosng.platform.api.commands.RolePermissionCommand; import org.mifosng.platform.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException; import org.mifosng.platform.exceptions.PermissionNotFoundException; import org.mifosng.platform.exceptions.RoleNotFoundException; import org.mifosng.platform.security.PlatformSecurityContext; +import org.mifosplatform.infrastructure.user.command.RoleCommand; +import org.mifosplatform.infrastructure.user.command.RoleCommandValidator; +import org.mifosplatform.infrastructure.user.command.RolePermissionCommand; import org.mifosplatform.infrastructure.user.domain.Permission; import org.mifosplatform.infrastructure.user.domain.PermissionRepository; import org.mifosplatform.infrastructure.user.domain.Role;