Fix/Renable sidecar builds

Issue-ID: AAF-613
Change-Id: Ic13411eebbf3c1c9b6d8492aff1b37db37a965e4
Signed-off-by: Instrumental <jonathan.gathman@att.com>

13 files changed, 41 insertions, 65 deletions

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;