summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rw-r--r--pom.xml19
-rw-r--r--sidecar/fproxy/.gitignore1
-rw-r--r--sidecar/fproxy/pom.xml58
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/CredentialCacheConfig.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/CredentialCacheConfig.java)6
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/FProxyApplication.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/FProxyApplication.java)2
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/RestTemplateConfig.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/RestTemplateConfig.java)2
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/CredentialCache.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/CredentialCache.java)4
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/InMemoryCredentialCache.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/InMemoryCredentialCache.java)5
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/utils/CacheUtils.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/utils/CacheUtils.java)9
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/data/CredentialCacheData.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/data/CredentialCacheData.java)2
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/service/ForwardingProxyService.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/service/ForwardingProxyService.java)7
-rw-r--r--sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/util/RequestValidationException.java (renamed from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/util/RequestValidationException.java)2
-rw-r--r--sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyIT.java (renamed from sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyIT.java)4
-rw-r--r--sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyServiceTest.java (renamed from sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java)4
-rw-r--r--sidecar/pom.xml156
-rw-r--r--sidecar/rproxy/.gitignore1
-rw-r--r--sidecar/rproxy/pom.xml24
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyEntryExitLoggingAspect.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyEntryExitLoggingAspect.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTime.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTime.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTimeAnnotation.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTimeAnnotation.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyApplication.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyApplication.java)10
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyAuthorizationFilter.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyAuthorizationFilter.java)6
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyService.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyService.java)15
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/CadiProperties.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/CadiProperties.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ForwardProxyProperties.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ForwardProxyProperties.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/PrimaryServiceProperties.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/PrimaryServiceProperties.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxySSLProperties.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxySSLProperties.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxyURIAuthorizationProperties.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxyURIAuthorizationProperties.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/mocks/ReverseProxyMockCadiFilter.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyAuthorization.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyAuthorization.java)2
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyUtils.java (renamed from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyUtils.java)2
-rw-r--r--sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/PermissionMatchingTest.java (renamed from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/PermissionMatchingTest.java)6
-rw-r--r--sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyApplicationTest.java (renamed from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyApplicationTest.java)6
-rw-r--r--sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyIT.java (renamed from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyIT.java)3
-rw-r--r--sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyTestConfig.java (renamed from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyTestConfig.java)4
-rw-r--r--sidecar/tproxy-config/pom.xml1
37 files changed, 204 insertions, 184 deletions
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 @@
<cadi.version>2.1.7-SNAPSHOT</cadi.version>
<!-- <sonar.skip>true</sonar.skip> -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
+ <!-- project.jettyVersion>9.4.12.v20180830</project.jettyVersion -->
<powermock.version>1.5.1</powermock.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -131,9 +131,7 @@
<modules>
<module>shiro</module>
<module>shiro-osgi-bundle</module>
- <!-- Not in Casablanca
<module>sidecar</module>
- -->
</modules>
<!-- ============================================================== -->
@@ -159,7 +157,6 @@
<version>${cadi.version}</version>
</dependency>
-
<!-- Prevent Cycles in Testing -->
<dependency>
<groupId>org.onap.aaf.authz</groupId>
@@ -216,6 +213,8 @@
<artifactId>aaf-misc-log4j</artifactId>
<version>${cadi.version}</version>
</dependency>
+
+ <!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -252,13 +251,7 @@
<artifactId>jetty-server</artifactId>
<version>${project.jettyVersion}</version>
</dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- </dependency>
-
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -282,8 +275,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
</configuration>
</plugin>
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 @@
<name>Sidecar fproxy</name>
<description>ONAP AAF Forward Proxy Microservice For Pluggable Security</description>
- <properties>
- <!-- Spring boot version -->
- <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
- <docker.location>${basedir}/target</docker.location>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
+ <!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jetty</artifactId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
-
+
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-json</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
</dependency>
- <!-- Testing -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
</dependency>
-
</dependencies>
<build>
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
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
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
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
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
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
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
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
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
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
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
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--* ============LICENSE_START====================================================
- * ===========================================================================
- * 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====================================================
- * -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.onap.aaf.cadi</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.7-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ * ===========================================================================
+ * 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====================================================
+ * -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.onap.aaf.cadi</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.7-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
@@ -33,38 +33,97 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <sonar.skip>true</sonar.skip>
+ <jacoco.version>0.7.7.201606060606</jacoco.version>
+ <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+ <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+ <!-- Default Sonar configuration -->
+ <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+ <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+ <!-- Note: This list should match jacoco-maven-plugin's exclusion list
+ below -->
+ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+ <nexusproxy>https://nexus.onap.org</nexusproxy>
+ <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+ <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+ <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+ <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+
<java.version>1.8</java.version>
- <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
+ <!-- Spring boot version
+ Must match oParent
+ -->
+ <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
+ <spring.web.version>3.0.4.RELEASE</spring.web.version>
<docker.location>${basedir}/target</docker.location>
<!-- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> -->
+
</properties>
-
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.onap.aaf.cadi.sidecar</groupId>
- <artifactId>fproxy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.aaf.cadi.sidecar</groupId>
- <artifactId>rproxy</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
+ <artifactId>fproxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.aaf.cadi.sidecar</groupId>
+ <artifactId>rproxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
<dependency>
- <!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
+
</dependencies>
</dependencyManagement>
- <!-- ============================================================== -->
+ <!-- ============================================================== -->
<!-- Define sub-projects (modules) -->
<!-- ============================================================== -->
<modules>
@@ -74,19 +133,6 @@
</modules>
<build>
- <plugins>
- <!-- Sidecare only works on Java 1.8 and above -->
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -112,7 +158,7 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
</build>
</project>
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 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <!--
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -49,7 +50,9 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId>
</exclusion>
+
</exclusions>
+ -->
</dependency>
<dependency>
@@ -58,11 +61,6 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
@@ -70,7 +68,16 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
</dependency>
<!-- Application Dependencies -->
@@ -85,11 +92,6 @@
<artifactId>gson</artifactId>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
-
<!-- CADI -->
<dependency>
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>3.0</version>
<configuration>
<header>License.txt</header>
<includes>