From 5aa8aec689a399e7803e84e531532d0c61631ec1 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 7 Nov 2018 20:52:15 -0600 Subject: [PATCH] Fix/Renable sidecar builds Issue-ID: AAF-613 Change-Id: Ic13411eebbf3c1c9b6d8492aff1b37db37a965e4 Signed-off-by: Instrumental --- .gitignore | 9 +- pom.xml | 19 +-- sidecar/fproxy/.gitignore | 1 + sidecar/fproxy/pom.xml | 58 ++------ .../sidecar}/fproxy/CredentialCacheConfig.java | 6 +- .../sidecar}/fproxy/FProxyApplication.java | 2 +- .../sidecar}/fproxy/RestTemplateConfig.java | 2 +- .../sidecar}/fproxy/cache/CredentialCache.java | 4 +- .../fproxy/cache/InMemoryCredentialCache.java | 5 +- .../sidecar}/fproxy/cache/utils/CacheUtils.java | 9 +- .../sidecar}/fproxy/data/CredentialCacheData.java | 2 +- .../fproxy/service/ForwardingProxyService.java | 7 +- .../fproxy/util/RequestValidationException.java | 2 +- .../sidecar/fproxy/test}/FProxyIT.java | 4 +- .../sidecar/fproxy/test}/FProxyServiceTest.java | 4 +- sidecar/pom.xml | 156 +++++++++++++-------- sidecar/rproxy/.gitignore | 1 + sidecar/rproxy/pom.xml | 24 ++-- .../ReverseProxyEntryExitLoggingAspect.java | 2 +- .../rpoxy}/logging/ReverseProxyMethodLogTime.java | 2 +- .../ReverseProxyMethodLogTimeAnnotation.java | 2 +- .../sidecar}/rproxy/ReverseProxyApplication.java | 10 +- .../rproxy/ReverseProxyAuthorizationFilter.java | 6 +- .../sidecar}/rproxy/ReverseProxyService.java | 15 +- .../sidecar}/rproxy/config/CadiProperties.java | 2 +- .../rproxy/config/ForwardProxyProperties.java | 2 +- .../rproxy/config/PrimaryServiceProperties.java | 2 +- .../rproxy/config/ReverseProxySSLProperties.java | 2 +- .../ReverseProxyURIAuthorizationProperties.java | 2 +- .../rproxy/mocks/ReverseProxyMockCadiFilter.java | 2 +- .../rproxy/utils/ReverseProxyAuthorization.java | 2 +- .../sidecar}/rproxy/utils/ReverseProxyUtils.java | 2 +- .../rproxy/test}/PermissionMatchingTest.java | 6 +- .../rproxy/test}/ReverseProxyApplicationTest.java | 6 +- .../sidecar/rproxy/test}/ReverseProxyIT.java | 3 +- .../rproxy/test}/ReverseProxyTestConfig.java | 4 +- sidecar/tproxy-config/pom.xml | 1 - 37 files changed, 204 insertions(+), 184 deletions(-) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/CredentialCacheConfig.java (88%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/FProxyApplication.java (98%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/RestTemplateConfig.java (98%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/cache/CredentialCache.java (91%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/cache/InMemoryCredentialCache.java (97%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/cache/utils/CacheUtils.java (93%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/data/CredentialCacheData.java (97%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/service/ForwardingProxyService.java (95%) rename sidecar/fproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/fproxy/util/RequestValidationException.java (96%) rename sidecar/fproxy/src/test/java/org/onap/aaf/{fproxy => cadi/sidecar/fproxy/test}/FProxyIT.java (93%) rename sidecar/fproxy/src/test/java/org/onap/aaf/{fproxy => cadi/sidecar/fproxy/test}/FProxyServiceTest.java (98%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{rproxy => cadi/sidecar/rpoxy}/logging/ReverseProxyEntryExitLoggingAspect.java (97%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{rproxy => cadi/sidecar/rpoxy}/logging/ReverseProxyMethodLogTime.java (97%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{rproxy => cadi/sidecar/rpoxy}/logging/ReverseProxyMethodLogTimeAnnotation.java (96%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/ReverseProxyApplication.java (96%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/ReverseProxyAuthorizationFilter.java (97%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/ReverseProxyService.java (94%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/config/CadiProperties.java (97%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/config/ForwardProxyProperties.java (97%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/config/PrimaryServiceProperties.java (97%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/config/ReverseProxySSLProperties.java (97%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/config/ReverseProxyURIAuthorizationProperties.java (96%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/mocks/ReverseProxyMockCadiFilter.java (99%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/utils/ReverseProxyAuthorization.java (96%) rename sidecar/rproxy/src/main/java/org/onap/aaf/{ => cadi/sidecar}/rproxy/utils/ReverseProxyUtils.java (96%) rename sidecar/rproxy/src/test/java/org/onap/aaf/{rproxy => cadi/sidecar/rproxy/test}/PermissionMatchingTest.java (98%) rename sidecar/rproxy/src/test/java/org/onap/aaf/{rproxy => cadi/sidecar/rproxy/test}/ReverseProxyApplicationTest.java (97%) rename sidecar/rproxy/src/test/java/org/onap/aaf/{rproxy => cadi/sidecar/rproxy/test}/ReverseProxyIT.java (94%) rename sidecar/rproxy/src/test/java/org/onap/aaf/{rproxy => cadi/sidecar/rproxy/test}/ReverseProxyTestConfig.java (94%) diff --git a/.gitignore b/.gitignore index d93e941..f3bad09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -target/ -.idea -*.iml -.checkstyle +/.classpath +/.settings/ +/target/ +/.project +/logs/ diff --git a/pom.xml b/pom.xml index 8e9f174..16282a0 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 2.1.7-SNAPSHOT UTF-8 - 9.3.9.v20160517 + 1.5.1 0.7.7.201606060606 @@ -131,9 +131,7 @@ shiro shiro-osgi-bundle - @@ -159,7 +157,6 @@ ${cadi.version} - org.onap.aaf.authz @@ -216,6 +213,8 @@ aaf-misc-log4j ${cadi.version} + + org.slf4j slf4j-api @@ -282,8 +275,8 @@ maven-compiler-plugin 2.3.2 - 1.7 - 1.7 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/sidecar/fproxy/.gitignore b/sidecar/fproxy/.gitignore index 6028f0a..f3bad09 100644 --- a/sidecar/fproxy/.gitignore +++ b/sidecar/fproxy/.gitignore @@ -2,3 +2,4 @@ /.settings/ /target/ /.project +/logs/ diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml index 0246eb2..e79bd3e 100644 --- a/sidecar/fproxy/pom.xml +++ b/sidecar/fproxy/pom.xml @@ -33,68 +33,40 @@ Sidecar fproxy ONAP AAF Forward Proxy Microservice For Pluggable Security - - - 2.0.3.RELEASE - ${basedir}/target - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - + org.springframework.boot - spring-boot-starter-jetty + spring-boot-dependencies + ${spring.boot.version} + pom + import - + - org.springframework.boot - spring-boot-starter-web - - - spring-boot-starter-tomcat - org.springframework.boot - - - org.springframework.boot - spring-boot-starter-json - - + org.apache.httpcomponents + httpclient - + - org.apache.commons - commons-lang3 + org.springframework.boot + spring-boot-starter-jetty - org.apache.httpcomponents - httpclient + org.springframework.boot + spring-boot-starter-aop - com.google.code.gson - gson + org.springframework.boot + spring-boot-starter-web - org.springframework.boot spring-boot-starter-test - test - diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/CredentialCacheConfig.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/CredentialCacheConfig.java similarity index 88% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/CredentialCacheConfig.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/CredentialCacheConfig.java index f433c65..53132d2 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/CredentialCacheConfig.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/CredentialCacheConfig.java @@ -17,10 +17,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy; +package org.onap.aaf.cadi.sidecar.fproxy; -import org.onap.aaf.fproxy.cache.CredentialCache; -import org.onap.aaf.fproxy.cache.InMemoryCredentialCache; +import org.onap.aaf.cadi.sidecar.fproxy.cache.CredentialCache; +import org.onap.aaf.cadi.sidecar.fproxy.cache.InMemoryCredentialCache; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/FProxyApplication.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/FProxyApplication.java similarity index 98% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/FProxyApplication.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/FProxyApplication.java index d226dc8..7e3ffe4 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/FProxyApplication.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/FProxyApplication.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy; +package org.onap.aaf.cadi.sidecar.fproxy; import java.util.HashMap; import javax.annotation.PostConstruct; diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/RestTemplateConfig.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/RestTemplateConfig.java similarity index 98% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/RestTemplateConfig.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/RestTemplateConfig.java index 8acfd86..23f3471 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/RestTemplateConfig.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/RestTemplateConfig.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy; +package org.onap.aaf.cadi.sidecar.fproxy; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/CredentialCache.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/CredentialCache.java similarity index 91% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/CredentialCache.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/CredentialCache.java index 00fe9d4..bd05313 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/CredentialCache.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/CredentialCache.java @@ -17,9 +17,9 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy.cache; +package org.onap.aaf.cadi.sidecar.fproxy.cache; -import org.onap.aaf.fproxy.data.CredentialCacheData; +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData; import org.springframework.lang.Nullable; public interface CredentialCache { diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/InMemoryCredentialCache.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/InMemoryCredentialCache.java similarity index 97% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/InMemoryCredentialCache.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/InMemoryCredentialCache.java index 44ce0cd..5ba9bdb 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/InMemoryCredentialCache.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/InMemoryCredentialCache.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy.cache; +package org.onap.aaf.cadi.sidecar.fproxy.cache; import java.lang.ref.SoftReference; import java.util.Optional; @@ -25,7 +25,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.DelayQueue; import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; -import org.onap.aaf.fproxy.data.CredentialCacheData; + +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData; public class InMemoryCredentialCache implements CredentialCache { diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/utils/CacheUtils.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/utils/CacheUtils.java similarity index 93% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/utils/CacheUtils.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/utils/CacheUtils.java index b80fc32..1825293 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/utils/CacheUtils.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/utils/CacheUtils.java @@ -17,12 +17,13 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy.cache.utils; +package org.onap.aaf.cadi.sidecar.fproxy.cache.utils; import javax.servlet.http.HttpServletRequest; -import org.onap.aaf.fproxy.cache.CredentialCache; -import org.onap.aaf.fproxy.data.CredentialCacheData; -import org.onap.aaf.fproxy.data.CredentialCacheData.CredentialType; + +import org.onap.aaf.cadi.sidecar.fproxy.cache.CredentialCache; +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData; +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData.CredentialType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/data/CredentialCacheData.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/data/CredentialCacheData.java similarity index 97% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/data/CredentialCacheData.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/data/CredentialCacheData.java index b72ea08..6918ded 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/data/CredentialCacheData.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/data/CredentialCacheData.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy.data; +package org.onap.aaf.cadi.sidecar.fproxy.data; public class CredentialCacheData { diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/service/ForwardingProxyService.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/service/ForwardingProxyService.java similarity index 95% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/service/ForwardingProxyService.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/service/ForwardingProxyService.java index 0d150ba..6a09bb9 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/service/ForwardingProxyService.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/service/ForwardingProxyService.java @@ -17,14 +17,15 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy.service; +package org.onap.aaf.cadi.sidecar.fproxy.service; import java.net.URI; import java.util.Enumeration; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.onap.aaf.fproxy.cache.utils.CacheUtils; -import org.onap.aaf.fproxy.data.CredentialCacheData; + +import org.onap.aaf.cadi.sidecar.fproxy.cache.utils.CacheUtils; +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/util/RequestValidationException.java b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/util/RequestValidationException.java similarity index 96% rename from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/util/RequestValidationException.java rename to sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/util/RequestValidationException.java index ce6e162..236d093 100644 --- a/sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/util/RequestValidationException.java +++ b/sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/util/RequestValidationException.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy.util; +package org.onap.aaf.cadi.sidecar.fproxy.util; /** This exception is thrown when the request fails validation. */ public class RequestValidationException extends Exception { diff --git a/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyIT.java b/sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyIT.java similarity index 93% rename from sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyIT.java rename to sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyIT.java index ba876e0..308eb26 100644 --- a/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyIT.java +++ b/sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyIT.java @@ -17,14 +17,14 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy; +package org.onap.aaf.cadi.sidecar.fproxy.test; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.jetty.util.security.Password; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.aaf.fproxy.service.ForwardingProxyService; +import org.onap.aaf.cadi.sidecar.fproxy.service.ForwardingProxyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; diff --git a/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java b/sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyServiceTest.java similarity index 98% rename from sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java rename to sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyServiceTest.java index e78d48b..8943a09 100644 --- a/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java +++ b/sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyServiceTest.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.fproxy; +package org.onap.aaf.cadi.sidecar.fproxy.test; import static org.hamcrest.Matchers.equalTo; import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; @@ -32,7 +32,7 @@ import org.eclipse.jetty.util.security.Password; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.aaf.fproxy.data.CredentialCacheData.CredentialType; +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData.CredentialType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; diff --git a/sidecar/pom.xml b/sidecar/pom.xml index def9f20..c926d99 100644 --- a/sidecar/pom.xml +++ b/sidecar/pom.xml @@ -1,29 +1,29 @@ - - - org.onap.aaf.cadi - parent - 2.1.7-SNAPSHOT - .. - + * =========================================================================== + * org.onap.aaf + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =========================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END==================================================== + * --> + + + org.onap.aaf.cadi + parent + 2.1.7-SNAPSHOT + .. + 4.0.0 org.onap.aaf.cadi.sidecar sidecar @@ -33,38 +33,97 @@ UTF-8 UTF-8 + true + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} + 1.8 - 2.0.3.RELEASE + + 2.0.3.RELEASE + 3.0.4.RELEASE ${basedir}/target + - - - org.onap.aaf.cadi.sidecar - fproxy - ${project.version} - - - org.onap.aaf.cadi.sidecar - rproxy - ${project.version} - + + org.onap.aaf.cadi.sidecar + fproxy + ${project.version} + + + org.onap.aaf.cadi.sidecar + rproxy + ${project.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + + + + org.aspectj + aspectjrt + 1.9.2 + + + + com.google.code.gson + gson + 2.8.5 + + + + org.apache.commons + commons-lang3 + 3.8.1 + + + + org.springframework.boot + spring-boot-starter-jetty + ${spring.boot.version} + + + + org.springframework.boot + spring-boot-starter-aop + ${spring.boot.version} + - org.springframework.boot - spring-boot-dependencies + spring-boot-starter-web + ${spring.boot.version} + + + + org.springframework.boot + spring-boot-starter-test ${spring.boot.version} - pom - import + - + @@ -74,19 +133,6 @@ - - - - true - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - ${java.version} - ${java.version} - - - @@ -112,7 +158,7 @@ - + diff --git a/sidecar/rproxy/.gitignore b/sidecar/rproxy/.gitignore index 6028f0a..f3bad09 100644 --- a/sidecar/rproxy/.gitignore +++ b/sidecar/rproxy/.gitignore @@ -2,3 +2,4 @@ /.settings/ /target/ /.project +/logs/ diff --git a/sidecar/rproxy/pom.xml b/sidecar/rproxy/pom.xml index 6c32238..57f5f0d 100644 --- a/sidecar/rproxy/pom.xml +++ b/sidecar/rproxy/pom.xml @@ -40,6 +40,7 @@ org.springframework.boot spring-boot-starter-web + @@ -57,11 +60,6 @@ spring-boot-starter-jetty - - org.apache.httpcomponents - httpclient - - org.springframework.boot spring-boot-starter-aop @@ -70,7 +68,16 @@ org.springframework.boot spring-boot-starter-test - test + + + + org.apache.httpcomponents + httpclient + + + + org.aspectj + aspectjrt @@ -85,11 +92,6 @@ gson - - org.mockito - mockito-core - - diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyEntryExitLoggingAspect.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyEntryExitLoggingAspect.java similarity index 97% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyEntryExitLoggingAspect.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyEntryExitLoggingAspect.java index 174420c..b6e2f85 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyEntryExitLoggingAspect.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyEntryExitLoggingAspect.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.logging; +package org.onap.aaf.cadi.sidecar.rpoxy.logging; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.After; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTime.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTime.java similarity index 97% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTime.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTime.java index 00cfba6..bc3a489 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTime.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTime.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.logging; +package org.onap.aaf.cadi.sidecar.rpoxy.logging; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTimeAnnotation.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTimeAnnotation.java similarity index 96% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTimeAnnotation.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTimeAnnotation.java index 55f00f4..ddd6fe9 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTimeAnnotation.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTimeAnnotation.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.logging; +package org.onap.aaf.cadi.sidecar.rpoxy.logging; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyApplication.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyApplication.java similarity index 96% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyApplication.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyApplication.java index ebceceb..3e36935 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyApplication.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyApplication.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy; +package org.onap.aaf.cadi.sidecar.rproxy; import java.io.IOException; import java.security.GeneralSecurityException; @@ -32,10 +32,10 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContextBuilder; import org.eclipse.jetty.util.security.Password; import org.onap.aaf.cadi.filter.CadiFilter; -import org.onap.aaf.rproxy.config.ForwardProxyProperties; -import org.onap.aaf.rproxy.config.PrimaryServiceProperties; -import org.onap.aaf.rproxy.config.ReverseProxySSLProperties; -import org.onap.aaf.rproxy.mocks.ReverseProxyMockCadiFilter; +import org.onap.aaf.cadi.sidecar.rproxy.config.ForwardProxyProperties; +import org.onap.aaf.cadi.sidecar.rproxy.config.PrimaryServiceProperties; +import org.onap.aaf.cadi.sidecar.rproxy.config.ReverseProxySSLProperties; +import org.onap.aaf.cadi.sidecar.rproxy.mocks.ReverseProxyMockCadiFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyAuthorizationFilter.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyAuthorizationFilter.java similarity index 97% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyAuthorizationFilter.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyAuthorizationFilter.java index f939249..2ef4cc0 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyAuthorizationFilter.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyAuthorizationFilter.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy; +package org.onap.aaf.cadi.sidecar.rproxy; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -45,8 +45,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpStatus; import org.onap.aaf.cadi.CadiWrap; import org.onap.aaf.cadi.Permission; -import org.onap.aaf.rproxy.config.ReverseProxyURIAuthorizationProperties; -import org.onap.aaf.rproxy.utils.ReverseProxyAuthorization; +import org.onap.aaf.cadi.sidecar.rproxy.config.ReverseProxyURIAuthorizationProperties; +import org.onap.aaf.cadi.sidecar.rproxy.utils.ReverseProxyAuthorization; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyService.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyService.java similarity index 94% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyService.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyService.java index 55fcdd1..e15fb2a 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyService.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyService.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy; +package org.onap.aaf.cadi.sidecar.rproxy; import java.net.URI; import java.net.URISyntaxException; @@ -25,12 +25,13 @@ import java.util.Enumeration; import java.util.UUID; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import org.onap.aaf.fproxy.data.CredentialCacheData; -import org.onap.aaf.fproxy.data.CredentialCacheData.CredentialType; -import org.onap.aaf.rproxy.config.ForwardProxyProperties; -import org.onap.aaf.rproxy.config.PrimaryServiceProperties; -import org.onap.aaf.rproxy.logging.ReverseProxyMethodLogTimeAnnotation; -import org.onap.aaf.rproxy.utils.ReverseProxyUtils; + +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData; +import org.onap.aaf.cadi.sidecar.fproxy.data.CredentialCacheData.CredentialType; +import org.onap.aaf.cadi.sidecar.rpoxy.logging.ReverseProxyMethodLogTimeAnnotation; +import org.onap.aaf.cadi.sidecar.rproxy.config.ForwardProxyProperties; +import org.onap.aaf.cadi.sidecar.rproxy.config.PrimaryServiceProperties; +import org.onap.aaf.cadi.sidecar.rproxy.utils.ReverseProxyUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/CadiProperties.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/CadiProperties.java similarity index 97% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/CadiProperties.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/CadiProperties.java index 0afb506..841d8d8 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/CadiProperties.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/CadiProperties.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.config; +package org.onap.aaf.cadi.sidecar.rproxy.config; import java.net.MalformedURLException; import org.springframework.beans.factory.annotation.Value; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ForwardProxyProperties.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ForwardProxyProperties.java similarity index 97% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ForwardProxyProperties.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ForwardProxyProperties.java index 3607797..5c0d2c8 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ForwardProxyProperties.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ForwardProxyProperties.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.config; +package org.onap.aaf.cadi.sidecar.rproxy.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/PrimaryServiceProperties.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/PrimaryServiceProperties.java similarity index 97% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/PrimaryServiceProperties.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/PrimaryServiceProperties.java index 994dc55..e201ae6 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/PrimaryServiceProperties.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/PrimaryServiceProperties.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.config; +package org.onap.aaf.cadi.sidecar.rproxy.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxySSLProperties.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxySSLProperties.java similarity index 97% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxySSLProperties.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxySSLProperties.java index 31e8a0d..ee7a240 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxySSLProperties.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxySSLProperties.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.config; +package org.onap.aaf.cadi.sidecar.rproxy.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxyURIAuthorizationProperties.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxyURIAuthorizationProperties.java similarity index 96% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxyURIAuthorizationProperties.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxyURIAuthorizationProperties.java index da25d9c..193d753 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxyURIAuthorizationProperties.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxyURIAuthorizationProperties.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.config; +package org.onap.aaf.cadi.sidecar.rproxy.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/mocks/ReverseProxyMockCadiFilter.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java similarity index 99% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/mocks/ReverseProxyMockCadiFilter.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java index 10bfc3e..1c4de92 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/mocks/ReverseProxyMockCadiFilter.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.mocks; +package org.onap.aaf.cadi.sidecar.rproxy.mocks; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyAuthorization.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyAuthorization.java similarity index 96% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyAuthorization.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyAuthorization.java index 6c5baa2..fd9db8e 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyAuthorization.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyAuthorization.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.utils; +package org.onap.aaf.cadi.sidecar.rproxy.utils; public class ReverseProxyAuthorization { diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyUtils.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyUtils.java similarity index 96% rename from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyUtils.java rename to sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyUtils.java index d2d1ba4..495a78c 100644 --- a/sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyUtils.java +++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy.utils; +package org.onap.aaf.cadi.sidecar.rproxy.utils; public class ReverseProxyUtils { diff --git a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/PermissionMatchingTest.java b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/PermissionMatchingTest.java similarity index 98% rename from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/PermissionMatchingTest.java rename to sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/PermissionMatchingTest.java index 43e20fe..e9dd95b 100644 --- a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/PermissionMatchingTest.java +++ b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/PermissionMatchingTest.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy; +package org.onap.aaf.cadi.sidecar.rproxy.test; import static org.hamcrest.Matchers.equalTo; import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; @@ -33,8 +33,8 @@ import org.eclipse.jetty.util.security.Password; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.aaf.rproxy.config.ForwardProxyProperties; -import org.onap.aaf.rproxy.config.PrimaryServiceProperties; +import org.onap.aaf.cadi.sidecar.rproxy.config.ForwardProxyProperties; +import org.onap.aaf.cadi.sidecar.rproxy.config.PrimaryServiceProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; diff --git a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyApplicationTest.java b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyApplicationTest.java similarity index 97% rename from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyApplicationTest.java rename to sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyApplicationTest.java index 61a0923..cff8f9b 100644 --- a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyApplicationTest.java +++ b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyApplicationTest.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy; +package org.onap.aaf.cadi.sidecar.rproxy.test; import static org.hamcrest.Matchers.equalTo; import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; @@ -34,8 +34,8 @@ import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.aaf.rproxy.config.ForwardProxyProperties; -import org.onap.aaf.rproxy.config.PrimaryServiceProperties; +import org.onap.aaf.cadi.sidecar.rproxy.config.ForwardProxyProperties; +import org.onap.aaf.cadi.sidecar.rproxy.config.PrimaryServiceProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; diff --git a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyIT.java b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyIT.java similarity index 94% rename from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyIT.java rename to sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyIT.java index 615afd4..17f55f6 100644 --- a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyIT.java +++ b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyIT.java @@ -17,13 +17,14 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy; +package org.onap.aaf.cadi.sidecar.rproxy.test; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.jetty.util.security.Password; import org.junit.Test; import org.junit.runner.RunWith; +import org.onap.aaf.cadi.sidecar.rproxy.ReverseProxyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; diff --git a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyTestConfig.java b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyTestConfig.java similarity index 94% rename from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyTestConfig.java rename to sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyTestConfig.java index c512e6a..eada157 100644 --- a/sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyTestConfig.java +++ b/sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyTestConfig.java @@ -17,9 +17,9 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.aaf.rproxy; +package org.onap.aaf.cadi.sidecar.rproxy.test; -import org.onap.aaf.rproxy.mocks.ReverseProxyMockCadiFilter; +import org.onap.aaf.cadi.sidecar.rproxy.mocks.ReverseProxyMockCadiFilter; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.RegistrationBean; diff --git a/sidecar/tproxy-config/pom.xml b/sidecar/tproxy-config/pom.xml index b9a7104..a0b6982 100644 --- a/sidecar/tproxy-config/pom.xml +++ b/sidecar/tproxy-config/pom.xml @@ -46,7 +46,6 @@ com.mycila license-maven-plugin - 3.0
License.txt
-- 2.16.6