Fix/Renable sidecar builds 54/72154/1
authorInstrumental <jonathan.gathman@att.com>
Thu, 8 Nov 2018 02:52:15 +0000 (20:52 -0600)
committerInstrumental <jonathan.gathman@att.com>
Thu, 8 Nov 2018 02:52:27 +0000 (20:52 -0600)
Issue-ID: AAF-613
Change-Id: Ic13411eebbf3c1c9b6d8492aff1b37db37a965e4
Signed-off-by: Instrumental <jonathan.gathman@att.com>
37 files changed:
.gitignore
pom.xml
sidecar/fproxy/.gitignore
sidecar/fproxy/pom.xml
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/CredentialCacheConfig.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/CredentialCacheConfig.java with 88% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/FProxyApplication.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/FProxyApplication.java with 98% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/RestTemplateConfig.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/RestTemplateConfig.java with 98% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/CredentialCache.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/CredentialCache.java with 91% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/InMemoryCredentialCache.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/InMemoryCredentialCache.java with 97% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/cache/utils/CacheUtils.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/cache/utils/CacheUtils.java with 93% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/data/CredentialCacheData.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/data/CredentialCacheData.java with 97% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/service/ForwardingProxyService.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/service/ForwardingProxyService.java with 95% similarity]
sidecar/fproxy/src/main/java/org/onap/aaf/cadi/sidecar/fproxy/util/RequestValidationException.java [moved from sidecar/fproxy/src/main/java/org/onap/aaf/fproxy/util/RequestValidationException.java with 96% similarity]
sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyIT.java [moved from sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyIT.java with 93% similarity]
sidecar/fproxy/src/test/java/org/onap/aaf/cadi/sidecar/fproxy/test/FProxyServiceTest.java [moved from sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java with 98% similarity]
sidecar/pom.xml
sidecar/rproxy/.gitignore
sidecar/rproxy/pom.xml
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyEntryExitLoggingAspect.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyEntryExitLoggingAspect.java with 97% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTime.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTime.java with 97% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rpoxy/logging/ReverseProxyMethodLogTimeAnnotation.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/logging/ReverseProxyMethodLogTimeAnnotation.java with 96% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyApplication.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyApplication.java with 96% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyAuthorizationFilter.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyAuthorizationFilter.java with 97% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/ReverseProxyService.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/ReverseProxyService.java with 94% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/CadiProperties.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/CadiProperties.java with 97% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ForwardProxyProperties.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ForwardProxyProperties.java with 97% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/PrimaryServiceProperties.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/PrimaryServiceProperties.java with 97% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxySSLProperties.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxySSLProperties.java with 97% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/config/ReverseProxyURIAuthorizationProperties.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/config/ReverseProxyURIAuthorizationProperties.java with 96% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/mocks/ReverseProxyMockCadiFilter.java with 99% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyAuthorization.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyAuthorization.java with 96% similarity]
sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/utils/ReverseProxyUtils.java [moved from sidecar/rproxy/src/main/java/org/onap/aaf/rproxy/utils/ReverseProxyUtils.java with 96% similarity]
sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/PermissionMatchingTest.java [moved from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/PermissionMatchingTest.java with 98% similarity]
sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyApplicationTest.java [moved from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyApplicationTest.java with 97% similarity]
sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyIT.java [moved from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyIT.java with 94% similarity]
sidecar/rproxy/src/test/java/org/onap/aaf/cadi/sidecar/rproxy/test/ReverseProxyTestConfig.java [moved from sidecar/rproxy/src/test/java/org/onap/aaf/rproxy/ReverseProxyTestConfig.java with 94% similarity]
sidecar/tproxy-config/pom.xml

index d93e941..f3bad09 100644 (file)
@@ -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 (file)
--- 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>
        <modules>
                <module>shiro</module>
                <module>shiro-osgi-bundle</module>
-               <!-- Not in Casablanca 
                <module>sidecar</module>
-               -->
        </modules>
 
        <!-- ============================================================== -->
                                <version>${cadi.version}</version>
                        </dependency>
 
-
                        <!-- Prevent Cycles in Testing -->
                        <dependency>
                                <groupId>org.onap.aaf.authz</groupId>
                                <artifactId>aaf-misc-log4j</artifactId>
                                <version>${cadi.version}</version>
                        </dependency>
+                       
+                       <!-- 
 
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <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>
                                        <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>
 
index 6028f0a..f3bad09 100644 (file)
@@ -2,3 +2,4 @@
 /.settings/
 /target/
 /.project
+/logs/
index 0246eb2..e79bd3e 100644 (file)
        <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>
  * 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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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 {
 
  * 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;
@@ -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 {
 
  * 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;
@@ -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 {
  * 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;
@@ -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;
index def9f20..c926d99 100644 (file)
@@ -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>
        <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>
        </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>
                                                </execution>
                                        </executions>
                                </plugin>
-                       </plugins>              
+                       </plugins>
                </pluginManagement>
        </build>
 </project>
index 6028f0a..f3bad09 100644 (file)
@@ -2,3 +2,4 @@
 /.settings/
 /target/
 /.project
+/logs/
index 6c32238..57f5f0d 100644 (file)
@@ -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>
                        <artifactId>spring-boot-starter-jetty</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-               </dependency>
-
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-aop</artifactId>
                <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 -->
                        <artifactId>gson</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-               </dependency>           
-               
                <!-- CADI -->
 
                <dependency>
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
 
@@ -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;
@@ -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;
  * 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;
@@ -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;
index b9a7104..a0b6982 100644 (file)
@@ -46,7 +46,6 @@
                        <plugin>
                                <groupId>com.mycila</groupId>
                                <artifactId>license-maven-plugin</artifactId>
-                               <version>3.0</version>
                                <configuration>
                                        <header>License.txt</header>
                                        <includes>