From 375001472fa8c286ac61557c63f2703da923b1d1 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Tue, 6 Aug 2019 19:36:13 +0000 Subject: introduce base adaptor introduce base adaptor for other adaptors to extend Issue-ID: CCSDK-1595 Signed-off-by: Smokowski, Kevin (ks6305) Change-Id: I35d4499491cd87a7d651fa9ed654ad7c677ae2b8 --- base/http/provider/pom.xml | 36 +++++++ .../adaptors/base/http/AbstractHttpAdapter.java | 109 +++++++++++++++++++++ .../sli/adaptors/base/http/BasicAuthFilter.java | 24 +++++ .../base/http/AbstractHttpAdapterTest.java | 47 +++++++++ .../adaptors/base/http/BasicAuthFilterTest.java | 20 ++++ .../src/test/resources/testprops.properties | 1 + 6 files changed, 237 insertions(+) create mode 100644 base/http/provider/pom.xml create mode 100644 base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java create mode 100644 base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java create mode 100644 base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java create mode 100644 base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java create mode 100644 base/http/provider/src/test/resources/testprops.properties (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml new file mode 100644 index 000000000..4cbe85c13 --- /dev/null +++ b/base/http/provider/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.3.2 + + + + org.onap.ccsdk.sli.adaptors + base-http-provider + 0.5.1-SNAPSHOT + bundle + + + + javax.ws.rs + javax.ws.rs-api + provided + + + org.slf4j + slf4j-api + provided + + + org.glassfish.jersey.core + jersey-client + ${jersey.version} + test + + + diff --git a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java new file mode 100644 index 000000000..fda4bafba --- /dev/null +++ b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java @@ -0,0 +1,109 @@ +package org.onap.ccsdk.sli.adaptors.base.http; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Properties; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.ws.rs.client.ClientBuilder; +import javax.xml.bind.DatatypeConverter; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class AbstractHttpAdapter { + protected static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR"; + private static final String SDNC_CONFIG_DIR_DEFAULT = "/opt/sdnc/data/properties"; + protected static final int DEFAULT_HTTP_CONNECT_TIMEOUT_MS = 60000; // 1 minute + protected static final int DEFAULT_HTTP_READ_TIMEOUT_MS = 1800000; // 30 minutes + protected ClientBuilder clientBuilder; + + private static final Logger logger = LoggerFactory.getLogger(AbstractHttpAdapter.class); + + public AbstractHttpAdapter() { + clientBuilder = ClientBuilder.newBuilder(); + setTimeouts(); + registerLoggingFilter(); + defaultHostNameVerifier(); + } + + private void defaultHostNameVerifier() { + clientBuilder.hostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String hostname, SSLSession session) { + return true; + } + }); + } + + protected abstract void registerLoggingFilter(); + + private void setTimeouts() { + Integer httpReadTimeout = readOptionalInteger("HTTP_READ_TIMEOUT_MS", DEFAULT_HTTP_READ_TIMEOUT_MS); + Integer httpConnectTimeout = readOptionalInteger("HTTP_CONNECT_TIMEOUT_MS", DEFAULT_HTTP_CONNECT_TIMEOUT_MS); + + // restore once we migrate to once we migrate to javax.ws.rs-api 2.1 + // clientBuilder.connectTimeout(30, TimeUnit.SECONDS); + // clientBuilder.readTimeout(30, TimeUnit.SECONDS); + + // Setting jersey specific properties is ugly, such behavior should be removed + // once we migrate to javax.ws.rs-api 2.1 + clientBuilder.property("jersey.config.client.readTimeout", httpReadTimeout); + clientBuilder.property("jersey.config.client.connectTimeout", httpConnectTimeout); + } + + public Properties getProperties(String propertiesFileName) throws FileNotFoundException, IOException { + // Check System property, then environment variable then default if null + String propDir = System.getProperty(SDNC_CONFIG_DIR); + if (propDir == null || propDir.length() < 1) { + propDir = System.getenv(SDNC_CONFIG_DIR); + } + if (propDir == null || propDir.length() < 1) { + propDir = SDNC_CONFIG_DIR_DEFAULT; + } + Properties properties = new Properties(); + // forward slash is checked to support path src/test/resources on windows machine + if (!propDir.endsWith(File.separator) && !propDir.endsWith("/")) { + propDir = propDir + File.separator; + } + String path = propDir + propertiesFileName; + properties.load(new FileInputStream(path)); + logger.trace("Initialized properties from ({}) properties ({})", path, properties); + return properties; + } + + protected void addBasicAuthCredentials(String username, String password) { + String basicAuthValue = getBasicAuthValue(username,password); + clientBuilder.register(new BasicAuthFilter(basicAuthValue)); + } + + protected String getBasicAuthValue(String userName, String password) { + String token = userName + ":" + password; + try { + return "BASIC " + DatatypeConverter.printBase64Binary(token.getBytes("UTF-8")); + } catch (Exception e) { + logger.error("getBasicAuthValue threw an exception, credentials will be null", e); + } + return null; + } + + public ClientBuilder getClientBuilder() { + return clientBuilder; + } + + private Integer readOptionalInteger(String propertyName, Integer defaultValue) { + String stringValue = System.getProperty(propertyName); + if (stringValue != null && stringValue.length() > 0) { + try { + return Integer.valueOf(stringValue); + } catch (NumberFormatException e) { + logger.warn("property " + propertyName + " had the value " + stringValue + " that could not be converted to an Integer, default " + defaultValue + " will be used instead", e); + } + } + return defaultValue; + } + +} diff --git a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java new file mode 100644 index 000000000..48d996ef3 --- /dev/null +++ b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java @@ -0,0 +1,24 @@ +package org.onap.ccsdk.sli.adaptors.base.http; + +import java.io.IOException; + +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.core.MultivaluedMap; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class BasicAuthFilter implements ClientRequestFilter { + private final String basicAuthValue; + + + public BasicAuthFilter(String basicAuthValue) { + this.basicAuthValue = basicAuthValue; + } + + public void filter(ClientRequestContext requestContext) throws IOException { + MultivaluedMap headers = requestContext.getHeaders(); + headers.add("Authorization", basicAuthValue); + } +} diff --git a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java new file mode 100644 index 000000000..ee2d223d3 --- /dev/null +++ b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java @@ -0,0 +1,47 @@ +package org.onap.ccsdk.sli.adaptors.base.http; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Properties; +import java.util.Set; + +import javax.ws.rs.client.Client; + +import org.junit.Test; + +public class AbstractHttpAdapterTest { + + public class NonLoggingHttpAdapter extends AbstractHttpAdapter { + @Override + protected void registerLoggingFilter() { + // nonlogging, do nothing + } + } + + @Test + public void checkTimeouts() throws Exception { + NonLoggingHttpAdapter adapter = new NonLoggingHttpAdapter(); + Client client = adapter.getClientBuilder().build(); + assertNotNull(client.getConfiguration().getProperty("jersey.config.client.readTimeout")); + assertNotNull(client.getConfiguration().getProperty("jersey.config.client.connectTimeout")); + } + + @Test + public void propertiesTest() throws Exception { + System.setProperty(AbstractHttpAdapter.SDNC_CONFIG_DIR, "src/test/resources/"); + NonLoggingHttpAdapter adapter = new NonLoggingHttpAdapter(); + Properties props = adapter.getProperties("testprops.properties"); + assertNotNull(props); + assertEquals("world", props.get("hello")); + } + + @Test + public void basicAuthFilter() throws Exception { + NonLoggingHttpAdapter adapter = new NonLoggingHttpAdapter(); + adapter.addBasicAuthCredentials("hello", "world"); + Set objs = adapter.getClientBuilder().getConfiguration().getInstances(); + assertEquals(BasicAuthFilter.class,objs.iterator().next().getClass()); + } + +} diff --git a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java new file mode 100644 index 000000000..b9565ba67 --- /dev/null +++ b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java @@ -0,0 +1,20 @@ +package org.onap.ccsdk.sli.adaptors.base.http; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; + +public class BasicAuthFilterTest { + + @Test + public void notNullParameters() throws Exception { + BasicAuthFilter myFilter = new BasicAuthFilter("helloworld"); + assertNotNull(myFilter); + } + + @Test + public void nullParameters() throws Exception { + BasicAuthFilter myFilter = new BasicAuthFilter(null); + assertNotNull(myFilter); + } +} diff --git a/base/http/provider/src/test/resources/testprops.properties b/base/http/provider/src/test/resources/testprops.properties new file mode 100644 index 000000000..3f602680e --- /dev/null +++ b/base/http/provider/src/test/resources/testprops.properties @@ -0,0 +1 @@ +hello = world \ No newline at end of file -- cgit From 99f1934d72099f7d77467290722ea74da983d3bb Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 14 Aug 2019 08:48:48 -0400 Subject: Fix version in base module Fix version, which was breaking merge build. Change-Id: I73c8d1e2be56e739164545ad1b5f9bf69985b719 Issue-ID: CCSDK-1618 Signed-off-by: Timoney, Dan (dt5972) --- base/http/provider/pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 4cbe85c13..083a7fc7f 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -1,18 +1,17 @@ - + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.3.2 - + 1.3.3-SNAPSHOT + org.onap.ccsdk.sli.adaptors base-http-provider - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT bundle -- cgit From dbbd392fdc622c85958598213b2f423848666af6 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 3 Jul 2019 14:30:56 -0400 Subject: Code changes for OpenDaylight Neon Updated code for OpenDaylight Neon, using conversion script in ccsdk/parent/tools. Change-Id: Ic91cff9ee50102b8af1a73f829908de82995b2ef Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) --- base/http/provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 083a7fc7f..17ff73984 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT -- cgit From 9db21abb0e6ac1409f5ce631b327dcc36fb287f7 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 16 Aug 2019 08:54:01 -0400 Subject: Fix version numbers Fix version numbers in sli/adaptors/base Change-Id: I78f204212dd2dc6a528a98091ebd94e3876f6102 Issue-ID: CCSDK-1401 Signed-off-by: Timoney, Dan (dt5972) --- base/http/provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 17ff73984..5b9a60509 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.sli.adaptors base-http-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle -- cgit From e82381b841584a4d4f94ade8ddf5a881353742bf Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 28 Aug 2019 13:13:32 -0400 Subject: Roll versions Roll versions in master branch Change-Id: Idbfc7999336f017e81a1715a9255d72188647d18 Signed-off-by: Timoney, Dan (dt5972) --- base/http/provider/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 5b9a60509..293cc1603 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-provider - 0.6.0-SNAPSHOT + 0.6.1-SNAPSHOT bundle -- cgit From 4736befed266373062619037ca55db4d6c9c2fb0 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 10 Sep 2019 16:16:07 -0400 Subject: Roll version for Frankfurt release Roll version in master branch to Frankfurt version (0.7.0-SNAPSHOT) Change-Id: I668004304935d1d1c312749f4c2507a159db4f0f Issue-ID: CCSDK-1701 Signed-off-by: Timoney, Dan (dt5972) --- base/http/provider/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 293cc1603..56728be61 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-provider - 0.6.1-SNAPSHOT + 0.7.0-SNAPSHOT bundle -- cgit From 29924c8fd09d8b32d21a8e41f5a22f7fc282ec17 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Mon, 16 Sep 2019 14:22:57 +0000 Subject: AbstractHttpAdapter bugfix basic auth key value needs Basic prepended not BASIC Issue-ID: CCSDK-1729 Signed-off-by: Smokowski, Kevin (ks6305) Change-Id: I204d4948a88f322ab2cfce5df4072850da2c0653 --- .../java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java index fda4bafba..92e64b6dd 100644 --- a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java +++ b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java @@ -83,7 +83,7 @@ public abstract class AbstractHttpAdapter { protected String getBasicAuthValue(String userName, String password) { String token = userName + ":" + password; try { - return "BASIC " + DatatypeConverter.printBase64Binary(token.getBytes("UTF-8")); + return "Basic " + DatatypeConverter.printBase64Binary(token.getBytes("UTF-8")); } catch (Exception e) { logger.error("getBasicAuthValue threw an exception, credentials will be null", e); } -- cgit From c3988ec2b7b98eeb3b061ddb08a74eeb90d49edb Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Thu, 17 Oct 2019 21:00:21 +0000 Subject: add filters to base incorporate common filters into base adaptor Issue-ID: CCSDK-1849 Signed-off-by: Smokowski, Kevin (ks6305) Change-Id: Ib1de49f29ff88c0f8cff87642ae60dc11517331b --- base/http/provider/pom.xml | 6 ++++++ .../sli/adaptors/base/http/AbstractHttpAdapter.java | 17 +++++++++++------ .../sli/adaptors/base/http/AbstractHttpAdapterTest.java | 13 +++++-------- 3 files changed, 22 insertions(+), 14 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 56728be61..e6061ed62 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -31,5 +31,11 @@ ${jersey.version} test + + org.onap.logging-analytics + logging-filter-base + 1.5.0 + provided + diff --git a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java index 92e64b6dd..cc6f06a4d 100644 --- a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java +++ b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java @@ -4,13 +4,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.util.Base64; import java.util.Properties; - import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; import javax.ws.rs.client.ClientBuilder; -import javax.xml.bind.DatatypeConverter; - +import org.onap.logging.filter.base.MetricLogClientFilter; +import org.onap.logging.filter.base.PayloadLoggingClientFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +26,6 @@ public abstract class AbstractHttpAdapter { public AbstractHttpAdapter() { clientBuilder = ClientBuilder.newBuilder(); setTimeouts(); - registerLoggingFilter(); defaultHostNameVerifier(); } @@ -39,7 +38,13 @@ public abstract class AbstractHttpAdapter { }); } - protected abstract void registerLoggingFilter(); + protected void enableMetricLogging() { + clientBuilder.register(new MetricLogClientFilter()); + } + + protected void enablePayloadLogging() { + clientBuilder.register(new PayloadLoggingClientFilter()); + } private void setTimeouts() { Integer httpReadTimeout = readOptionalInteger("HTTP_READ_TIMEOUT_MS", DEFAULT_HTTP_READ_TIMEOUT_MS); @@ -83,7 +88,7 @@ public abstract class AbstractHttpAdapter { protected String getBasicAuthValue(String userName, String password) { String token = userName + ":" + password; try { - return "Basic " + DatatypeConverter.printBase64Binary(token.getBytes("UTF-8")); + return "Basic " + Base64.getEncoder().encodeToString(token.getBytes()); } catch (Exception e) { logger.error("getBasicAuthValue threw an exception, credentials will be null", e); } diff --git a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java index ee2d223d3..d0973d90e 100644 --- a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java +++ b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java @@ -12,16 +12,13 @@ import org.junit.Test; public class AbstractHttpAdapterTest { - public class NonLoggingHttpAdapter extends AbstractHttpAdapter { - @Override - protected void registerLoggingFilter() { - // nonlogging, do nothing - } + public class TestAdapter extends AbstractHttpAdapter { + } @Test public void checkTimeouts() throws Exception { - NonLoggingHttpAdapter adapter = new NonLoggingHttpAdapter(); + TestAdapter adapter = new TestAdapter(); Client client = adapter.getClientBuilder().build(); assertNotNull(client.getConfiguration().getProperty("jersey.config.client.readTimeout")); assertNotNull(client.getConfiguration().getProperty("jersey.config.client.connectTimeout")); @@ -30,7 +27,7 @@ public class AbstractHttpAdapterTest { @Test public void propertiesTest() throws Exception { System.setProperty(AbstractHttpAdapter.SDNC_CONFIG_DIR, "src/test/resources/"); - NonLoggingHttpAdapter adapter = new NonLoggingHttpAdapter(); + TestAdapter adapter = new TestAdapter(); Properties props = adapter.getProperties("testprops.properties"); assertNotNull(props); assertEquals("world", props.get("hello")); @@ -38,7 +35,7 @@ public class AbstractHttpAdapterTest { @Test public void basicAuthFilter() throws Exception { - NonLoggingHttpAdapter adapter = new NonLoggingHttpAdapter(); + TestAdapter adapter = new TestAdapter(); adapter.addBasicAuthCredentials("hello", "world"); Set objs = adapter.getClientBuilder().getConfiguration().getInstances(); assertEquals(BasicAuthFilter.class,objs.iterator().next().getClass()); -- cgit From 5c6b2000726e657eb6a1ed468ae14f95e9df0ce4 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Thu, 31 Oct 2019 14:35:47 +0000 Subject: pom updates inherit version for org.onap.logging-analytics artifacts, add back two dependecies for aai service Issue-ID: CCSDK-1882 Signed-off-by: Smokowski, Kevin (ks6305) Change-Id: I469d42c0b8bb5d86c3e9acaa97b5be11dda361e0 --- base/http/provider/pom.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index e6061ed62..aabeca268 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -34,7 +34,6 @@ org.onap.logging-analytics logging-filter-base - 1.5.0 provided -- cgit From 83559ddc77a0217391212f2abcdcba2c3ff56937 Mon Sep 17 00:00:00 2001 From: "Agarwal, Ruchira (ra1926)" Date: Tue, 5 Nov 2019 18:16:50 +0000 Subject: minor updates to clean up code clean up code to sync with internal Issue-ID: CCSDK-1873 Signed-off-by: Agarwal, Ruchira (ra1926) Change-Id: Idcc7186d5aaa783c527de3986e7a1ecd9bfcf651 --- base/http/provider/pom.xml | 1 - .../java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java | 6 ++---- .../org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index aabeca268..642238cd2 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -28,7 +28,6 @@ org.glassfish.jersey.core jersey-client - ${jersey.version} test diff --git a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java index 48d996ef3..5d3d463c9 100644 --- a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java +++ b/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java @@ -6,13 +6,9 @@ import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.core.MultivaluedMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class BasicAuthFilter implements ClientRequestFilter { private final String basicAuthValue; - public BasicAuthFilter(String basicAuthValue) { this.basicAuthValue = basicAuthValue; } @@ -21,4 +17,6 @@ public class BasicAuthFilter implements ClientRequestFilter { MultivaluedMap headers = requestContext.getHeaders(); headers.add("Authorization", basicAuthValue); } + + } diff --git a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java index b9565ba67..d9d552dac 100644 --- a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java +++ b/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java @@ -8,7 +8,7 @@ public class BasicAuthFilterTest { @Test public void notNullParameters() throws Exception { - BasicAuthFilter myFilter = new BasicAuthFilter("helloworld"); + BasicAuthFilter myFilter = new BasicAuthFilter("hello"); assertNotNull(myFilter); } -- cgit From a609b5ca43ab3aebde2004cf807795eec1a9dea9 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 13 Nov 2019 09:39:46 -0500 Subject: Use 1.5.0 parent pom Use released 1.5.0 version of parent pom Change-Id: I296db09cd94de93c150da5c2be5b34348ee320d7 Issue-ID: CCSDK-1920 Signed-off-by: Timoney, Dan (dt5972) --- base/http/provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 642238cd2..4e41a8f54 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.0-SNAPSHOT + 1.5.0 -- cgit From 54f98b397826e9d4281af1446b0227cdcf36f4a3 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 2 Dec 2019 12:35:00 -0500 Subject: Use 1.5.1-SNAPSHOT version of parent pom Fixed version of parent pom to use snapshot version Change-Id: Iec34f6ca9bd1ab14d4c1c8a837e3b693bd716069 Issue-ID: CCSDK-1935 Signed-off-by: Timoney, Dan (dt5972) --- base/http/provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 4e41a8f54..34a866c28 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.0 + 1.5.1-SNAPSHOT -- cgit From 4de5e6cbb62b3588a916f7696e7a9ecc73061782 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 23 Jan 2020 14:40:14 -0500 Subject: Use released parent pom Use released version of ccsdk/parent poms Change-Id: Ifa7059c687e09de9977b94d92fbf1869d510b00d Issue-ID: CCSDK-1963 Signed-off-by: Dan Timoney --- base/http/provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 34a866c28..007cea293 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.1-SNAPSHOT + 1.5.1 -- cgit From 6b1ac1200e74ff91e74df595c8e2a025b1bcd842 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 24 Jan 2020 16:03:21 -0500 Subject: Roll versions to next snapshot Roll CCSDK to next snapshot version Change-Id: Ib08be10d412384fcf791805c0101cfdb6375c178 Issue-ID: CCSDK-1963 Signed-off-by: Dan Timoney --- base/http/provider/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 007cea293..3b8add63c 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.1 + 1.5.2-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-provider - 0.7.0-SNAPSHOT + 0.7.1-SNAPSHOT bundle -- cgit From d95c9b66abae3570cd9d0bf86e9fc0d348e2ef1e Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 3 Mar 2020 12:23:18 -0500 Subject: Use released 1.5.2 CCSDK parent Update to use released version of CCSDK parent pom Change-Id: I24f981aaaca40909690d8118f7c0cdb8faa57d3a Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- base/http/provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 3b8add63c..b7002e521 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 -- cgit From a612cdd3fbed35c4d5b454c6f0329fa6ecec22e1 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 5 Mar 2020 11:51:01 -0500 Subject: Roll master to Guilin Roll versions of master for early Guilin development Change-Id: Id725abd9ecb3c67b2687e15286cb2f2bcd50be1a Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- base/http/provider/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index b7002e521..6aab259b4 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle -- cgit From 8bc3696b7c7c56671b2e9e09e6afbf0a57254421 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 6 Aug 2020 15:17:17 -0400 Subject: Roll to next snapshot Roll to snapshot version 1.0.1-SNAPSHOT Change-Id: Ie09ba5c2bedcd8cddf3e8cca0eff8e05c2ad268a Issue-ID: CCSDK-2635 Signed-off-by: Dan Timoney --- base/http/provider/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 6aab259b4..fb472ed1b 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-provider - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT bundle -- cgit From 3a489bb37be36b72bc584c530f2c514032e12b8c Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 9 Sep 2020 17:32:42 -0400 Subject: Roll to initial Honolulu release version Roll master branch to initial Honolulu release version Change-Id: Id7829542cb5981c11b38367952e6bc29ffa4cfe8 Issue-ID: CCSDK-2742 Signed-off-by: Dan Timoney --- base/http/provider/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index fb472ed1b..95007afbf 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-provider - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT bundle -- cgit From 2173e3e37bbb7648b97bcdfa734508686f176727 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 25 Nov 2020 14:51:48 -0500 Subject: Release version 1.1.0 of sli/adaptors Release initial Honolulu version of sli/adaptors and roll version to next snapshot Change-Id: I3a59f29d7819e8d777dd02aede9a263ea0be8e36 Issue-ID: CCSDK-3002 Signed-off-by: Dan Timoney --- base/http/provider/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base/http/provider') diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 95007afbf..5a3642fd2 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.0 org.onap.ccsdk.sli.adaptors base-http-provider - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle -- cgit