From 11510b43c277b8e1dd7e58d79785544810118c8e Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Tue, 1 Dec 2020 11:26:31 -0800 Subject: Migrate sli-adaptor files Migrate sli-adaptor repo files into a new "adaptors" directory. Signed-off-by: Jessica Wagantall --- base/http/installer/pom.xml | 127 --------------------- .../src/assembly/assemble_installer_zip.xml | 59 ---------- .../src/assembly/assemble_mvnrepo_zip.xml | 49 -------- .../src/main/resources/scripts/install-feature.sh | 39 ------- base/http/pom.xml | 21 ---- base/http/provider/pom.xml | 39 ------- .../adaptors/base/http/AbstractHttpAdapter.java | 114 ------------------ .../sli/adaptors/base/http/BasicAuthFilter.java | 22 ---- .../base/http/AbstractHttpAdapterTest.java | 44 ------- .../adaptors/base/http/BasicAuthFilterTest.java | 20 ---- .../src/test/resources/testprops.properties | 1 - base/pom.xml | 20 ---- 12 files changed, 555 deletions(-) delete mode 100644 base/http/installer/pom.xml delete mode 100644 base/http/installer/src/assembly/assemble_installer_zip.xml delete mode 100644 base/http/installer/src/assembly/assemble_mvnrepo_zip.xml delete mode 100644 base/http/installer/src/main/resources/scripts/install-feature.sh delete mode 100644 base/http/pom.xml delete mode 100644 base/http/provider/pom.xml delete mode 100644 base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java delete mode 100644 base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java delete mode 100644 base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java delete mode 100644 base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java delete mode 100644 base/http/provider/src/test/resources/testprops.properties delete mode 100644 base/pom.xml (limited to 'base') diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml deleted file mode 100644 index 980302ac9..000000000 --- a/base/http/installer/pom.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - base-http-installer - 1.1.1-SNAPSHOT - pom - - ccsdk-sli-adaptors :: base-http :: ${project.artifactId} - - - ccsdk-base-http - ${application.name} - mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features - false - - - - - - org.onap.ccsdk.sli.adaptors - base-http-provider - ${project.version} - - - - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - ccsdk-base-http,base-http-provider - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - - - - - - - - diff --git a/base/http/installer/src/assembly/assemble_installer_zip.xml b/base/http/installer/src/assembly/assemble_installer_zip.xml deleted file mode 100644 index 3bed4b5ef..000000000 --- a/base/http/installer/src/assembly/assemble_installer_zip.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - installer_zip - - zip - - - - false - - - - target/stage/ - ${application.name} - 755 - - *.sh - - - - target/stage/ - ${application.name} - 644 - - *.sh - - - - - - - diff --git a/base/http/installer/src/assembly/assemble_mvnrepo_zip.xml b/base/http/installer/src/assembly/assemble_mvnrepo_zip.xml deleted file mode 100644 index 35e79db18..000000000 --- a/base/http/installer/src/assembly/assemble_mvnrepo_zip.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - repo - - zip - - - - false - - - - target/assembly/ - . - - - - - - - - diff --git a/base/http/installer/src/main/resources/scripts/install-feature.sh b/base/http/installer/src/main/resources/scripts/install-feature.sh deleted file mode 100644 index 6e3d4169d..000000000 --- a/base/http/installer/src/main/resources/scripts/install-feature.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# 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========================================================= -### - -ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} -ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -INSTALLERDIR=$(dirname $0) - -REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip - -if [ -f ${REPOZIP} ] -then - unzip -nd ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 -fi - -${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} feature:install ${features.boot} diff --git a/base/http/pom.xml b/base/http/pom.xml deleted file mode 100644 index 05840986d..000000000 --- a/base/http/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors.base - http - 1.1.1-SNAPSHOT - pom - - - provider - installer - - diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml deleted file mode 100644 index 5a3642fd2..000000000 --- a/base/http/provider/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - base-http-provider - 1.1.1-SNAPSHOT - bundle - - - - javax.ws.rs - javax.ws.rs-api - provided - - - org.slf4j - slf4j-api - provided - - - org.glassfish.jersey.core - jersey-client - test - - - org.onap.logging-analytics - logging-filter-base - 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 deleted file mode 100644 index cc6f06a4d..000000000 --- a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapter.java +++ /dev/null @@ -1,114 +0,0 @@ -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.Base64; -import java.util.Properties; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLSession; -import javax.ws.rs.client.ClientBuilder; -import org.onap.logging.filter.base.MetricLogClientFilter; -import org.onap.logging.filter.base.PayloadLoggingClientFilter; -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(); - defaultHostNameVerifier(); - } - - private void defaultHostNameVerifier() { - clientBuilder.hostnameVerifier(new HostnameVerifier() { - @Override - public boolean verify(String hostname, SSLSession session) { - return true; - } - }); - } - - 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); - 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 " + Base64.getEncoder().encodeToString(token.getBytes()); - } 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 deleted file mode 100644 index 5d3d463c9..000000000 --- a/base/http/provider/src/main/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilter.java +++ /dev/null @@ -1,22 +0,0 @@ -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; - -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 deleted file mode 100644 index d0973d90e..000000000 --- a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/AbstractHttpAdapterTest.java +++ /dev/null @@ -1,44 +0,0 @@ -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 TestAdapter extends AbstractHttpAdapter { - - } - - @Test - public void checkTimeouts() throws Exception { - 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")); - } - - @Test - public void propertiesTest() throws Exception { - System.setProperty(AbstractHttpAdapter.SDNC_CONFIG_DIR, "src/test/resources/"); - TestAdapter adapter = new TestAdapter(); - Properties props = adapter.getProperties("testprops.properties"); - assertNotNull(props); - assertEquals("world", props.get("hello")); - } - - @Test - public void basicAuthFilter() throws Exception { - TestAdapter adapter = new TestAdapter(); - 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 deleted file mode 100644 index d9d552dac..000000000 --- a/base/http/provider/src/test/java/org/onap/ccsdk/sli/adaptors/base/http/BasicAuthFilterTest.java +++ /dev/null @@ -1,20 +0,0 @@ -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("hello"); - 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 deleted file mode 100644 index 3f602680e..000000000 --- a/base/http/provider/src/test/resources/testprops.properties +++ /dev/null @@ -1 +0,0 @@ -hello = world \ No newline at end of file diff --git a/base/pom.xml b/base/pom.xml deleted file mode 100644 index a8e6b9193..000000000 --- a/base/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - base-parent - 1.1.1-SNAPSHOT - pom - - - http - - -- cgit 1.2.3-korg