aboutsummaryrefslogtreecommitdiffstats
path: root/prh-aai-client
diff options
context:
space:
mode:
Diffstat (limited to 'prh-aai-client')
-rw-r--r--prh-aai-client/pom.xml77
-rw-r--r--prh-aai-client/src/main/java/services/config/AAIConfig.java (renamed from prh-aai-client/src/main/java/services/config/Config.java)2
-rw-r--r--prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java30
-rw-r--r--prh-aai-client/src/main/java/services/config/DmaapConfig.java34
4 files changed, 99 insertions, 44 deletions
diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml
index 5ac67ce8..8efa0a35 100644
--- a/prh-aai-client/pom.xml
+++ b/prh-aai-client/pom.xml
@@ -1,14 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ ============LICENSE_START=======================================================
+ ~ PROJECT
+ ~ ================================================================================
+ ~ Copyright (C) 2018 NOKIA 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=========================================================
+ -->
<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>
<artifactId>prh</artifactId>
<groupId>org.onap.dcaegen2.services</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>prh-aai-client</artifactId>
+ <groupId>org.onap.dcaegen2.services.prh</groupId>
+ <packaging>jar</packaging>
+
+
+ <properties>
+ <main.basedir>${project.parent.basedir}</main.basedir>
+ </properties>
+
+ <dependencies>
+
+ <!-- DEVELOPMENT DEPENDENCIES -->
+ <dependency>
+ <groupId>org.immutables</groupId>
+ <artifactId>value</artifactId>
+ </dependency>
+
+ <!-- LOGGING DEPENDENCIES-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+
+ <!-- TEST DEPENDENCIES-->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project> \ No newline at end of file
diff --git a/prh-aai-client/src/main/java/services/config/Config.java b/prh-aai-client/src/main/java/services/config/AAIConfig.java
index a2a012c5..5d98b6ce 100644
--- a/prh-aai-client/src/main/java/services/config/Config.java
+++ b/prh-aai-client/src/main/java/services/config/AAIConfig.java
@@ -24,6 +24,6 @@ import java.io.Serializable;
/**
* @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
*/
-interface Config extends Serializable {
+interface AAIConfig extends Serializable {
}
diff --git a/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
index 396a78be..a7b0aac6 100644
--- a/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
+++ b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
@@ -27,15 +27,29 @@ import org.immutables.value.Value;
*/
@Value.Immutable(prehash = true)
@Value.Style(stagedBuilder = true)
-public abstract class AAIDmaapProducerConfiguration extends DmaapConfig {
+public abstract class AAIDmaapProducerConfiguration implements AAIConfig {
private static final long serialVersionUID = 1L;
- private String aaiHost;
- private Integer aaiHostPortNumber;
- private String aaiProtocol;
- private String aaiUserName;
- private String aaiUserPassword;
- private URL aaiProxyURL;
- private boolean aaiIgnoreSSLCertificateErrors;
+ @Value.Parameter
+ public abstract String aaiHost();
+
+ @Value.Parameter
+ public abstract Integer aaiHostPortNumber();
+
+ @Value.Parameter
+ public abstract String aaiProtocol();
+
+ @Value.Parameter
+ public abstract String aaiUserName();
+
+ @Value.Parameter
+ public abstract String aaiUserPassword();
+
+ @Value.Parameter
+ public abstract URL aaiProxyURL();
+
+ @Value.Parameter
+ public abstract boolean aaiIgnoreSSLCertificateErrors();
+
}
diff --git a/prh-aai-client/src/main/java/services/config/DmaapConfig.java b/prh-aai-client/src/main/java/services/config/DmaapConfig.java
deleted file mode 100644
index 0ddaea28..00000000
--- a/prh-aai-client/src/main/java/services/config/DmaapConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2018 NOKIA 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=========================================================
- */
-package services.config;
-
-/**
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
- */
-public abstract class DmaapConfig implements Config {
-
- private String dmmaphostName;
- private Integer dmmapportNumber;
- private String dmmaptopicName;
- private String dmmapprotocol;
- private String dmmapuserName;
- private String dmmapuserPassword;
- private String dmmapcontentType;
-}