From b196f93758edabf10174da160e8b74e7eec8ef72 Mon Sep 17 00:00:00 2001 From: wasala Date: Tue, 17 Apr 2018 12:25:54 +0200 Subject: Fixed the rest of the Security Issues *Introduce Gson Against Jackson library *Delete posix library with strong copyleft licenses Change-Id: I37ec6a359912481d1546293a8a8aeeedd6c907e2 Issue-ID: DCAEGEN2-426 Signed-off-by: wasala --- .../onap/dcaegen2/services/config/DmaapConsumerConfiguration.java | 4 ++-- .../onap/dcaegen2/services/config/DmaapPublisherConfiguration.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'prh-dmaap-client/src') diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java index 9b322c9c..de24caec 100644 --- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java @@ -19,7 +19,7 @@ */ package org.onap.dcaegen2.services.config; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.immutables.gson.Gson; import org.immutables.value.Value; import org.springframework.stereotype.Component; @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; @Component @Value.Immutable(prehash = true) @Value.Style(builder = "new") -@JsonDeserialize(builder = ImmutableDmaapConsumerConfiguration.Builder.class) +@Gson.TypeAdapters public abstract class DmaapConsumerConfiguration implements DmaapCustomConfig { private static final long serialVersionUID = 1L; diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapPublisherConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapPublisherConfiguration.java index 6607853e..50a79dd6 100644 --- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapPublisherConfiguration.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapPublisherConfiguration.java @@ -19,7 +19,7 @@ */ package org.onap.dcaegen2.services.config; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.immutables.gson.Gson; import org.immutables.value.Value; import org.springframework.stereotype.Component; @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; @Component @Value.Immutable(prehash = true) @Value.Style(builder = "new") -@JsonDeserialize(builder = ImmutableDmaapPublisherConfiguration.Builder.class) +@Gson.TypeAdapters public abstract class DmaapPublisherConfiguration implements DmaapCustomConfig { private static final long serialVersionUID = 1L; @@ -42,6 +42,4 @@ public abstract class DmaapPublisherConfiguration implements DmaapCustomConfig { public static DmaapPublisherConfiguration.Builder builder() { return ImmutableDmaapPublisherConfiguration.builder(); } - - } -- cgit 1.2.3-korg