diff options
author | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-12-01 11:26:31 -0800 |
---|---|---|
committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-12-01 11:27:11 -0800 |
commit | 11510b43c277b8e1dd7e58d79785544810118c8e (patch) | |
tree | b88a497c999d24b5f357ea9b26bc93e0990fd5e7 /base | |
parent | 5d2eab72fc4442f14108b41800cec88126913823 (diff) |
Migrate sli-adaptor files
Migrate sli-adaptor repo files into
a new "adaptors" directory.
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'base')
12 files changed, 0 insertions, 555 deletions
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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name> - - <properties> - <application.name>ccsdk-base-http</application.name> - <features.boot>${application.name}</features.boot> - <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> - - <dependencies> - - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>maven-repo-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>stage/${application.name}-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>true</appendAssemblyId> - </configuration> - </execution> - <execution> - <id>installer-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>${application.name}-${project.version}-installer</finalName> - <descriptors> - <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <transitive>false</transitive> - <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <useRepositoryLayout>true</useRepositoryLayout> - <addParentPoms>false</addParentPoms> - <copyPom>false</copyPom> - <includeArtifactIds>ccsdk-base-http,base-http-provider</includeArtifactIds> - <scope>provided</scope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/stage</outputDirectory> - <resources> - <resource> - <directory>src/main/resources/scripts</directory> - <includes> - <include>install-feature.sh</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - - </executions> - </plugin> - - </plugins> - </build> -</project> 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 @@ -<!-- - ============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========================================================= - --> - -<!-- Defines how we build the .zip file which is our distribution. --> - -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>installer_zip</id> - <formats> - <format>zip</format> - </formats> - - <!-- we want "system" and related files right at the root level - as this file is suppose to be unzip on top of a karaf - distro. --> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <fileSet> - <directory>target/stage/</directory> - <outputDirectory>${application.name}</outputDirectory> - <fileMode>755</fileMode> - <includes> - <include>*.sh</include> - </includes> - </fileSet> - <fileSet> - <directory>target/stage/</directory> - <outputDirectory>${application.name}</outputDirectory> - <fileMode>644</fileMode> - <excludes> - <exclude>*.sh</exclude> - </excludes> - </fileSet> - </fileSets> - - - -</assembly> 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 @@ -<!-- - ============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========================================================= - --> - -<!-- Defines how we build the .zip file which is our distribution. --> - -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>repo</id> - <formats> - <format>zip</format> - </formats> - - <!-- we want "system" and related files right at the root level - as this file is suppose to be unzip on top of a karaf - distro. --> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <fileSet> - <directory>target/assembly/</directory> - <outputDirectory>.</outputDirectory> - <excludes> - </excludes> - </fileSet> - </fileSets> - - - -</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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors.base</groupId> - <artifactId>http</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <modules> - <module>provider</module> - <module>installer</module> - </modules> -</project> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>bundle</packaging> - - <dependencies> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.onap.logging-analytics</groupId> - <artifactId>logging-filter-base</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> -</project> 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<String, Object> 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<Object> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-parent</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <modules> - <module>http</module> - </modules> -</project> |