summaryrefslogtreecommitdiffstats
path: root/prh-aai-client/src
diff options
context:
space:
mode:
authorwasala <przemyslaw.wasala@nokia.com>2018-04-03 14:41:23 +0200
committerwasala <przemyslaw.wasala@nokia.com>2018-04-04 11:18:48 +0200
commit86690cd541f2aadabb8659e3ce87eec5de8acdc4 (patch)
tree6988e8519fac55825521aa8f8b2d6f565000a6b3 /prh-aai-client/src
parent9a40270c21325804164ae30caf90ed75711143f2 (diff)
Added pushing docker image to nexus
Extended appConf loading Change-Id: Ibc3640cf4a66e40ce5dc585818c077534d09141c Issue-ID: DCAEGEN2-407 Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
Diffstat (limited to 'prh-aai-client/src')
-rw-r--r--prh-aai-client/src/main/java/services/config/AAIConfig.java29
-rw-r--r--prh-aai-client/src/main/java/services/config/AAIHttpClientConfiguration.java5
-rw-r--r--prh-aai-client/src/test/java/services/service/utils/HTTPConfiguration.java2
3 files changed, 4 insertions, 32 deletions
diff --git a/prh-aai-client/src/main/java/services/config/AAIConfig.java b/prh-aai-client/src/main/java/services/config/AAIConfig.java
deleted file mode 100644
index ed327fa2..00000000
--- a/prh-aai-client/src/main/java/services/config/AAIConfig.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * 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;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
- */
-interface AAIConfig extends Serializable {
-
-}
diff --git a/prh-aai-client/src/main/java/services/config/AAIHttpClientConfiguration.java b/prh-aai-client/src/main/java/services/config/AAIHttpClientConfiguration.java
index 4c50966b..d5a9281c 100644
--- a/prh-aai-client/src/main/java/services/config/AAIHttpClientConfiguration.java
+++ b/prh-aai-client/src/main/java/services/config/AAIHttpClientConfiguration.java
@@ -21,13 +21,14 @@
package services.config;
+import java.io.Serializable;
import org.immutables.value.Value;
import org.springframework.stereotype.Component;
@Component
@Value.Immutable(prehash = true)
@Value.Style(stagedBuilder = true)
-public abstract class AAIHttpClientConfiguration implements AAIConfig {
+public abstract class AAIHttpClientConfiguration implements Serializable {
private static final long serialVersionUID = 1L;
@@ -47,6 +48,6 @@ public abstract class AAIHttpClientConfiguration implements AAIConfig {
public abstract String aaiUserPassword();
@Value.Parameter
- public abstract boolean aaiIgnoreSSLCertificateErrors();
+ public abstract Boolean aaiIgnoreSSLCertificateErrors();
}
diff --git a/prh-aai-client/src/test/java/services/service/utils/HTTPConfiguration.java b/prh-aai-client/src/test/java/services/service/utils/HTTPConfiguration.java
index fb7b204a..82f656d9 100644
--- a/prh-aai-client/src/test/java/services/service/utils/HTTPConfiguration.java
+++ b/prh-aai-client/src/test/java/services/service/utils/HTTPConfiguration.java
@@ -56,7 +56,7 @@ public class HTTPConfiguration extends AAIHttpClientConfiguration {
}
@Override
- public boolean aaiIgnoreSSLCertificateErrors() {
+ public Boolean aaiIgnoreSSLCertificateErrors() {
return true;
}
} \ No newline at end of file