This is an automated email from the ASF dual-hosted git repository. awasum pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-permitted-feign-client.git
commit 418e916363249554d0dd963e5d28598a9a380007 Author: Myrle Krantz <[email protected]> AuthorDate: Fri Apr 13 12:17:08 2018 +0200 Adjusting to package name changes in upstream repositories. --- .../main/java/io/mifos/another/api/Another.java | 4 +- .../another/service/AnotherConfiguration.java | 8 +-- .../another/service/AnotherRestController.java | 4 +- .../api/v1/domain/ApplicationPermission.java | 7 ++- .../src/main/java/TestAccessAnother.java | 58 ++++++++++++---------- .../main/java/accessanother/api/AccessAnother.java | 4 +- .../service/AccessAnotherConfiguration.java | 6 +-- .../service/AccessAnotherRestController.java | 2 +- .../AnotherWithApplicationPermissions.java | 2 +- .../PermittedFeignClientsConfiguration.java | 8 +-- .../config/PermittedFeignClientConfiguration.java | 15 +++--- ...cationPermissionRequirementsRestController.java | 10 ++-- .../ApplicationTokenedTargetInterceptor.java | 9 ++-- .../service/ApplicationAccessTokenService.java | 33 ++++++------ .../ApplicationPermissionRequirementsService.java | 8 +-- .../service/ApplicationAccessTokenServiceTest.java | 21 ++++---- ...plicationPermissionRequirementsServiceTest.java | 15 +++--- 17 files changed, 107 insertions(+), 107 deletions(-) diff --git a/another-for-test/src/main/java/io/mifos/another/api/Another.java b/another-for-test/src/main/java/io/mifos/another/api/Another.java index a9678b2..2e88318 100644 --- a/another-for-test/src/main/java/io/mifos/another/api/Another.java +++ b/another-for-test/src/main/java/io/mifos/another/api/Another.java @@ -18,8 +18,8 @@ */ package io.mifos.another.api; -import io.mifos.anubis.api.v1.client.Anubis; -import io.mifos.core.api.util.CustomFeignClientsConfiguration; +import org.apache.fineract.cn.anubis.api.v1.client.Anubis; +import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/another-for-test/src/main/java/io/mifos/another/service/AnotherConfiguration.java b/another-for-test/src/main/java/io/mifos/another/service/AnotherConfiguration.java index 7802696..053b5db 100644 --- a/another-for-test/src/main/java/io/mifos/another/service/AnotherConfiguration.java +++ b/another-for-test/src/main/java/io/mifos/another/service/AnotherConfiguration.java @@ -18,10 +18,10 @@ */ package io.mifos.another.service; -import io.mifos.anubis.config.EnableAnubis; -import io.mifos.core.lang.config.EnableApplicationName; -import io.mifos.core.lang.config.EnableServiceException; -import io.mifos.core.lang.config.EnableTenantContext; +import org.apache.fineract.cn.anubis.config.EnableAnubis; +import org.apache.fineract.cn.lang.config.EnableApplicationName; +import org.apache.fineract.cn.lang.config.EnableServiceException; +import org.apache.fineract.cn.lang.config.EnableTenantContext; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/another-for-test/src/main/java/io/mifos/another/service/AnotherRestController.java b/another-for-test/src/main/java/io/mifos/another/service/AnotherRestController.java index 3397891..fc7d07c 100644 --- a/another-for-test/src/main/java/io/mifos/another/service/AnotherRestController.java +++ b/another-for-test/src/main/java/io/mifos/another/service/AnotherRestController.java @@ -18,8 +18,8 @@ */ package io.mifos.another.service; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; +import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; +import org.apache.fineract.cn.anubis.annotation.Permittable; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/api/src/main/java/io/mifos/permittedfeignclient/api/v1/domain/ApplicationPermission.java b/api/src/main/java/io/mifos/permittedfeignclient/api/v1/domain/ApplicationPermission.java index 9043811..7088aad 100644 --- a/api/src/main/java/io/mifos/permittedfeignclient/api/v1/domain/ApplicationPermission.java +++ b/api/src/main/java/io/mifos/permittedfeignclient/api/v1/domain/ApplicationPermission.java @@ -18,12 +18,11 @@ */ package io.mifos.permittedfeignclient.api.v1.domain; -import io.mifos.core.lang.validation.constraints.ValidIdentifier; -import io.mifos.identity.api.v1.domain.Permission; - +import java.util.Objects; import javax.annotation.Nullable; import javax.validation.Valid; -import java.util.Objects; +import org.apache.fineract.cn.identity.api.v1.domain.Permission; +import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; /** * @author Myrle Krantz diff --git a/component-test/src/main/java/TestAccessAnother.java b/component-test/src/main/java/TestAccessAnother.java index f086b42..a65727a 100644 --- a/component-test/src/main/java/TestAccessAnother.java +++ b/component-test/src/main/java/TestAccessAnother.java @@ -16,26 +16,42 @@ * specific language governing permissions and limitations * under the License. */ +import static accessanother.service.apiforother.AnotherWithApplicationPermissions.ENDPOINT_SET_IDENTIFIER; +import static org.apache.fineract.cn.test.env.TestEnvironment.RIBBON_USES_EUREKA_PROPERTY; +import static org.apache.fineract.cn.test.env.TestEnvironment.SPRING_CLOUD_DISCOVERY_ENABLED_PROPERTY; + import accessanother.api.AccessAnother; import accessanother.service.AccessAnotherConfiguration; import io.mifos.another.api.Another; -import io.mifos.anubis.api.v1.domain.AllowedOperation; -import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; -import io.mifos.core.api.config.EnableApiFactory; -import io.mifos.core.api.context.AutoUserContext; -import io.mifos.core.api.util.ApiFactory; -import io.mifos.core.lang.DateConverter; -import io.mifos.core.test.env.TestEnvironment; -import io.mifos.core.test.fixture.cassandra.CassandraInitializer; -import io.mifos.core.test.servicestarter.EurekaForTest; -import io.mifos.core.test.servicestarter.InitializedMicroservice; -import io.mifos.core.test.servicestarter.IntegrationTestEnvironment; -import io.mifos.identity.api.v1.client.IdentityManager; -import io.mifos.identity.api.v1.domain.Authentication; -import io.mifos.identity.api.v1.domain.Permission; import io.mifos.permittedfeignclient.api.v1.client.ApplicationPermissionRequirements; import io.mifos.permittedfeignclient.api.v1.domain.ApplicationPermission; -import org.junit.*; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Arrays; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation; +import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; +import org.apache.fineract.cn.api.config.EnableApiFactory; +import org.apache.fineract.cn.api.context.AutoUserContext; +import org.apache.fineract.cn.api.util.ApiFactory; +import org.apache.fineract.cn.identity.api.v1.client.IdentityManager; +import org.apache.fineract.cn.identity.api.v1.domain.Authentication; +import org.apache.fineract.cn.identity.api.v1.domain.Permission; +import org.apache.fineract.cn.lang.DateConverter; +import org.apache.fineract.cn.test.env.TestEnvironment; +import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; +import org.apache.fineract.cn.test.servicestarter.EurekaForTest; +import org.apache.fineract.cn.test.servicestarter.InitializedMicroservice; +import org.apache.fineract.cn.test.servicestarter.IntegrationTestEnvironment; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; import org.junit.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runner.RunWith; @@ -50,18 +66,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringRunner; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static accessanother.service.apiforother.AnotherWithApplicationPermissions.ENDPOINT_SET_IDENTIFIER; -import static io.mifos.core.test.env.TestEnvironment.RIBBON_USES_EUREKA_PROPERTY; -import static io.mifos.core.test.env.TestEnvironment.SPRING_CLOUD_DISCOVERY_ENABLED_PROPERTY; - /** * @author Myrle Krantz */ diff --git a/component-test/src/main/java/accessanother/api/AccessAnother.java b/component-test/src/main/java/accessanother/api/AccessAnother.java index 4c1def7..b9717d8 100644 --- a/component-test/src/main/java/accessanother/api/AccessAnother.java +++ b/component-test/src/main/java/accessanother/api/AccessAnother.java @@ -18,8 +18,8 @@ */ package accessanother.api; -import io.mifos.anubis.api.v1.client.Anubis; -import io.mifos.core.api.util.CustomFeignClientsConfiguration; +import org.apache.fineract.cn.anubis.api.v1.client.Anubis; +import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java b/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java index 0f6d6a8..92cc905 100644 --- a/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java +++ b/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java @@ -19,10 +19,10 @@ package accessanother.service; import accessanother.service.apiforother.AnotherWithApplicationPermissions; -import io.mifos.anubis.config.EnableAnubis; -import io.mifos.core.lang.config.EnableServiceException; -import io.mifos.core.lang.config.EnableTenantContext; import io.mifos.permittedfeignclient.config.EnablePermissionRequestingFeignClient; +import org.apache.fineract.cn.anubis.config.EnableAnubis; +import org.apache.fineract.cn.lang.config.EnableServiceException; +import org.apache.fineract.cn.lang.config.EnableTenantContext; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.netflix.feign.EnableFeignClients; diff --git a/component-test/src/main/java/accessanother/service/AccessAnotherRestController.java b/component-test/src/main/java/accessanother/service/AccessAnotherRestController.java index be6107b..eb16653 100644 --- a/component-test/src/main/java/accessanother/service/AccessAnotherRestController.java +++ b/component-test/src/main/java/accessanother/service/AccessAnotherRestController.java @@ -19,7 +19,7 @@ package accessanother.service; import accessanother.service.apiforother.AnotherWithApplicationPermissions; -import io.mifos.anubis.annotation.Permittable; +import org.apache.fineract.cn.anubis.annotation.Permittable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java b/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java index d30cdc0..3262122 100644 --- a/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java +++ b/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java @@ -18,9 +18,9 @@ */ package accessanother.service.apiforother; -import io.mifos.anubis.annotation.Permittable; import io.mifos.permittedfeignclient.annotation.EndpointSet; import io.mifos.permittedfeignclient.annotation.PermittedFeignClientsConfiguration; +import org.apache.fineract.cn.anubis.annotation.Permittable; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/library/src/main/java/io/mifos/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java b/library/src/main/java/io/mifos/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java index e8e86b9..aa7ee46 100644 --- a/library/src/main/java/io/mifos/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java +++ b/library/src/main/java/io/mifos/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java @@ -18,16 +18,18 @@ */ package io.mifos.permittedfeignclient.annotation; +import static org.apache.fineract.cn.api.config.ApiConfiguration.LOGGER_NAME; + import feign.Feign; import feign.Target; import feign.codec.Decoder; import feign.codec.Encoder; import feign.gson.GsonDecoder; import feign.gson.GsonEncoder; -import io.mifos.core.api.util.AnnotatedErrorDecoder; -import io.mifos.core.api.util.TenantedTargetInterceptor; import io.mifos.permittedfeignclient.security.ApplicationTokenedTargetInterceptor; import io.mifos.permittedfeignclient.service.ApplicationAccessTokenService; +import org.apache.fineract.cn.api.util.AnnotatedErrorDecoder; +import org.apache.fineract.cn.api.util.TenantedTargetInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -36,8 +38,6 @@ import org.springframework.cloud.netflix.feign.FeignClientsConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Scope; -import static io.mifos.core.api.config.ApiConfiguration.LOGGER_NAME; - /** * @author Myrle Krantz */ diff --git a/library/src/main/java/io/mifos/permittedfeignclient/config/PermittedFeignClientConfiguration.java b/library/src/main/java/io/mifos/permittedfeignclient/config/PermittedFeignClientConfiguration.java index 7bbed95..26636c6 100644 --- a/library/src/main/java/io/mifos/permittedfeignclient/config/PermittedFeignClientConfiguration.java +++ b/library/src/main/java/io/mifos/permittedfeignclient/config/PermittedFeignClientConfiguration.java @@ -22,13 +22,14 @@ import feign.Client; import feign.Feign; import feign.gson.GsonDecoder; import feign.gson.GsonEncoder; -import io.mifos.anubis.config.EnableAnubis; -import io.mifos.core.api.util.AnnotatedErrorDecoder; -import io.mifos.core.api.util.EmptyBodyInterceptor; -import io.mifos.core.api.util.TenantedTargetInterceptor; -import io.mifos.core.api.util.TokenedTargetInterceptor; -import io.mifos.identity.api.v1.client.IdentityManager; import io.mifos.permittedfeignclient.LibraryConstants; +import javax.annotation.Nonnull; +import org.apache.fineract.cn.anubis.config.EnableAnubis; +import org.apache.fineract.cn.api.util.AnnotatedErrorDecoder; +import org.apache.fineract.cn.api.util.EmptyBodyInterceptor; +import org.apache.fineract.cn.api.util.TenantedTargetInterceptor; +import org.apache.fineract.cn.api.util.TokenedTargetInterceptor; +import org.apache.fineract.cn.identity.api.v1.client.IdentityManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -36,8 +37,6 @@ import org.springframework.cloud.netflix.feign.support.SpringMvcContract; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.Nonnull; - /** * @author Myrle Krantz */ diff --git a/library/src/main/java/io/mifos/permittedfeignclient/controller/ApplicationPermissionRequirementsRestController.java b/library/src/main/java/io/mifos/permittedfeignclient/controller/ApplicationPermissionRequirementsRestController.java index a21f719..e9c97df 100644 --- a/library/src/main/java/io/mifos/permittedfeignclient/controller/ApplicationPermissionRequirementsRestController.java +++ b/library/src/main/java/io/mifos/permittedfeignclient/controller/ApplicationPermissionRequirementsRestController.java @@ -18,10 +18,12 @@ */ package io.mifos.permittedfeignclient.controller; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; -import io.mifos.permittedfeignclient.service.ApplicationPermissionRequirementsService; import io.mifos.permittedfeignclient.api.v1.domain.ApplicationPermission; +import io.mifos.permittedfeignclient.service.ApplicationPermissionRequirementsService; +import java.util.ArrayList; +import java.util.List; +import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; +import org.apache.fineract.cn.anubis.annotation.Permittable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -30,8 +32,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import java.util.*; - /** * @author Myrle Krantz */ diff --git a/library/src/main/java/io/mifos/permittedfeignclient/security/ApplicationTokenedTargetInterceptor.java b/library/src/main/java/io/mifos/permittedfeignclient/security/ApplicationTokenedTargetInterceptor.java index 7165b2d..d4a785e 100644 --- a/library/src/main/java/io/mifos/permittedfeignclient/security/ApplicationTokenedTargetInterceptor.java +++ b/library/src/main/java/io/mifos/permittedfeignclient/security/ApplicationTokenedTargetInterceptor.java @@ -20,14 +20,13 @@ package io.mifos.permittedfeignclient.security; import feign.RequestInterceptor; import feign.RequestTemplate; -import io.mifos.core.api.util.ApiConstants; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.TenantContextHolder; import io.mifos.permittedfeignclient.annotation.EndpointSet; import io.mifos.permittedfeignclient.service.ApplicationAccessTokenService; -import org.springframework.util.Assert; - import javax.annotation.Nonnull; +import org.apache.fineract.cn.api.util.ApiConstants; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.TenantContextHolder; +import org.springframework.util.Assert; /** * @author Myrle Krantz diff --git a/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenService.java b/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenService.java index 2b1f2c0..d729af3 100644 --- a/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenService.java +++ b/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenService.java @@ -18,31 +18,30 @@ */ package io.mifos.permittedfeignclient.service; -import io.mifos.anubis.config.TenantSignatureRepository; -import io.mifos.anubis.security.AmitAuthenticationException; -import io.mifos.anubis.token.TenantRefreshTokenSerializer; -import io.mifos.anubis.token.TokenSerializationResult; -import io.mifos.core.api.context.AutoGuest; -import io.mifos.core.api.util.NotFoundException; -import io.mifos.core.lang.ApplicationName; -import io.mifos.core.lang.AutoTenantContext; -import io.mifos.core.lang.security.RsaKeyPairFactory; -import io.mifos.identity.api.v1.client.IdentityManager; -import io.mifos.identity.api.v1.domain.Authentication; import io.mifos.permittedfeignclient.LibraryConstants; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jodah.expiringmap.ExpirationPolicy; import net.jodah.expiringmap.ExpiringMap; +import org.apache.fineract.cn.anubis.config.TenantSignatureRepository; +import org.apache.fineract.cn.anubis.security.AmitAuthenticationException; +import org.apache.fineract.cn.anubis.token.TenantRefreshTokenSerializer; +import org.apache.fineract.cn.anubis.token.TokenSerializationResult; +import org.apache.fineract.cn.api.context.AutoGuest; +import org.apache.fineract.cn.api.util.NotFoundException; +import org.apache.fineract.cn.identity.api.v1.client.IdentityManager; +import org.apache.fineract.cn.identity.api.v1.domain.Authentication; +import org.apache.fineract.cn.lang.ApplicationName; +import org.apache.fineract.cn.lang.AutoTenantContext; +import org.apache.fineract.cn.lang.security.RsaKeyPairFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.TimeUnit; - /** * @author Myrle Krantz */ diff --git a/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsService.java b/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsService.java index 278760b..77b7c3b 100644 --- a/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsService.java +++ b/library/src/main/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsService.java @@ -18,12 +18,12 @@ */ package io.mifos.permittedfeignclient.service; -import io.mifos.anubis.annotation.Permittable; -import io.mifos.anubis.annotation.Permittables; -import io.mifos.anubis.api.v1.domain.AllowedOperation; -import io.mifos.identity.api.v1.domain.Permission; import io.mifos.permittedfeignclient.annotation.EndpointSet; import io.mifos.permittedfeignclient.api.v1.domain.ApplicationPermission; +import org.apache.fineract.cn.anubis.annotation.Permittable; +import org.apache.fineract.cn.anubis.annotation.Permittables; +import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation; +import org.apache.fineract.cn.identity.api.v1.domain.Permission; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenServiceTest.java b/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenServiceTest.java index e898e16..74f3d68 100644 --- a/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenServiceTest.java +++ b/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationAccessTokenServiceTest.java @@ -18,15 +18,15 @@ */ package io.mifos.permittedfeignclient.service; -import io.mifos.anubis.config.TenantSignatureRepository; -import io.mifos.anubis.token.TenantRefreshTokenSerializer; -import io.mifos.anubis.token.TokenSerializationResult; -import io.mifos.core.lang.ApplicationName; -import io.mifos.core.lang.AutoTenantContext; -import io.mifos.core.lang.TenantContextHolder; -import io.mifos.core.lang.security.RsaKeyPairFactory; -import io.mifos.identity.api.v1.client.IdentityManager; -import io.mifos.identity.api.v1.domain.Authentication; +import org.apache.fineract.cn.anubis.config.TenantSignatureRepository; +import org.apache.fineract.cn.anubis.token.TenantRefreshTokenSerializer; +import org.apache.fineract.cn.anubis.token.TokenSerializationResult; +import org.apache.fineract.cn.identity.api.v1.client.IdentityManager; +import org.apache.fineract.cn.identity.api.v1.domain.Authentication; +import org.apache.fineract.cn.lang.ApplicationName; +import org.apache.fineract.cn.lang.AutoTenantContext; +import org.apache.fineract.cn.lang.TenantContextHolder; +import org.apache.fineract.cn.lang.security.RsaKeyPairFactory; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; @@ -71,7 +71,8 @@ public class ApplicationAccessTokenServiceTest { loggerMock); try (final AutoTenantContext ignored1 = new AutoTenantContext(TENANT_NAME)) { - final String accessTokenWithoutCallEndpointSet = testSubject.getAccessToken(USER_NAME, TenantContextHolder.checkedGetIdentifier()); + final String accessTokenWithoutCallEndpointSet = testSubject.getAccessToken(USER_NAME, TenantContextHolder + .checkedGetIdentifier()); Assert.assertEquals(BEARER_TOKEN_MOCK, accessTokenWithoutCallEndpointSet); final String accessToken = testSubject.getAccessToken(USER_NAME, TenantContextHolder.checkedGetIdentifier(), "blah"); diff --git a/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java b/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java index 7942319..52e1887 100644 --- a/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java +++ b/library/src/test/java/io/mifos/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java @@ -18,22 +18,21 @@ */ package io.mifos.permittedfeignclient.service; -import io.mifos.anubis.annotation.Permittable; -import io.mifos.anubis.api.v1.domain.AllowedOperation; -import io.mifos.identity.api.v1.domain.Permission; import io.mifos.permittedfeignclient.annotation.EndpointSet; import io.mifos.permittedfeignclient.api.v1.domain.ApplicationPermission; +import java.util.Collections; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.apache.fineract.cn.anubis.annotation.Permittable; +import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation; +import org.apache.fineract.cn.identity.api.v1.domain.Permission; import org.junit.Assert; import org.junit.Test; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import java.util.Collections; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Myrle Krantz */
