aboutsummaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2019-02-15 14:49:54 +0100
committerPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2019-02-18 15:20:20 +0100
commit28a5b0d5b6c844ca78665bded229e67a429800b7 (patch)
treee3fad7c857de1a734027fa9ccc3e9dcbb3cc29a5 /services
parent244b070d680eaac727091193b0998c76c78cc230 (diff)
Remove vavr from SSL API
It is still used internally, but methods does not depend on it. The goal was to support clean integration with any JVM app, ie. apps using Kotlin are rather using Arrow or nothing at all. Issue-ID: DCAEGEN2-1069 Change-Id: I1a9151bacd287d65ca8c84057de2f3c174cf8145 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'services')
-rw-r--r--services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/SystemUnderTestWrapper.java4
-rw-r--r--services/hv-ves-client/producer/impl/src/main/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/impl/HvVesProducerFactoryImpl.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/SystemUnderTestWrapper.java b/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/SystemUnderTestWrapper.java
index 87cf9fef..ec16e9e4 100644
--- a/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/SystemUnderTestWrapper.java
+++ b/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/SystemUnderTestWrapper.java
@@ -62,9 +62,9 @@ public class SystemUnderTestWrapper {
start(ImmutableProducerOptions.builder()
.securityKeys(ImmutableSecurityKeys.builder()
.keyStore(ImmutableSecurityKeysStore.of(resource("/client.p12").get()))
- .keyStorePassword(Passwords.fromResource("/client.pass").get())
+ .keyStorePassword(Passwords.fromResource("/client.pass"))
.trustStore(ImmutableSecurityKeysStore.of(resource("/trust.p12").get()))
- .trustStorePassword(Passwords.fromResource("/trust.pass").get())
+ .trustStorePassword(Passwords.fromResource("/trust.pass"))
.build()));
}
diff --git a/services/hv-ves-client/producer/impl/src/main/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/impl/HvVesProducerFactoryImpl.java b/services/hv-ves-client/producer/impl/src/main/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/impl/HvVesProducerFactoryImpl.java
index e135445e..185fca71 100644
--- a/services/hv-ves-client/producer/impl/src/main/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/impl/HvVesProducerFactoryImpl.java
+++ b/services/hv-ves-client/producer/impl/src/main/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/impl/HvVesProducerFactoryImpl.java
@@ -48,7 +48,7 @@ public class HvVesProducerFactoryImpl extends HvVesProducerFactory {
LOGGER.warn("Using insecure connection");
} else {
LOGGER.info("Using secure tunnel");
- final SslContext ctx = sslFactory.createSecureClientContext(options.securityKeys()).get();
+ final SslContext ctx = sslFactory.createSecureClientContext(options.securityKeys());
tcpClient = tcpClient.secure(ssl -> ssl.sslContext(ctx));
}