summaryrefslogtreecommitdiffstats
path: root/sidecar/fproxy/src/main/java/org
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-11-07 20:52:15 -0600
committerInstrumental <jonathan.gathman@att.com>2018-11-07 20:52:27 -0600
commit5aa8aec689a399e7803e84e531532d0c61631ec1 (patch)
treea5297d6d21b940b9411609331973909e1f6869e4 /sidecar/fproxy/src/main/java/org
parente9c0bf259db0084592536e896cc449b5cf34b84f (diff)
Fix/Renable sidecar builds
Issue-ID: AAF-613 Change-Id: Ic13411eebbf3c1c9b6d8492aff1b37db37a965e4 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'sidecar/fproxy/src/main/java/org')
-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
9 files changed, 21 insertions, 18 deletions
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 {