diff options
11 files changed, 28 insertions, 31 deletions
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSinkParser.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSinkParser.java index 42b86aee..83ca4cba 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSinkParser.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSinkParser.java @@ -41,14 +41,14 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.dma public final class DataRouterSinkParser implements StreamFromGsonParser<DataRouterSink> { private final Gson gson; - public static DataRouterSinkParser create() { - return new DataRouterSinkParser(gsonInstance()); - } - private DataRouterSinkParser(Gson gson) { this.gson = gson; } + public static DataRouterSinkParser create() { + return new DataRouterSinkParser(gsonInstance()); + } + @Override public DataRouterSink unsafeParse(RawDataStream<JsonObject> input) { assertStreamType(input, DATA_ROUTER_TYPE, DataStreamDirection.SINK); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSourceParser.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSourceParser.java index 7d29a90f..d8b7109d 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSourceParser.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/dr/DataRouterSourceParser.java @@ -41,14 +41,14 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.dma public final class DataRouterSourceParser implements StreamFromGsonParser<DataRouterSource> { private final Gson gson; - public static DataRouterSourceParser create() { - return new DataRouterSourceParser(gsonInstance()); - } - private DataRouterSourceParser(Gson gson) { this.gson = gson; } + public static DataRouterSourceParser create() { + return new DataRouterSourceParser(gsonInstance()); + } + @Override public DataRouterSource unsafeParse(RawDataStream<JsonObject> input) { assertStreamType(input, DATA_ROUTER_TYPE, DataStreamDirection.SOURCE); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSink.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSink.java index 5eef48d9..7122d7c5 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSink.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSink.java @@ -30,7 +30,8 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.dma public class GsonMessageRouterSink extends GsonMessageRouter implements MessageRouterSink { GsonMessageRouterSink( - String name, @NotNull MessageRouterDmaapInfo dmaapInfo, + String name, + @NotNull MessageRouterDmaapInfo dmaapInfo, @Nullable AafCredentials aafCredentials) { super(name, dmaapInfo, aafCredentials); } diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSource.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSource.java index d93a1d50..49871b11 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSource.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/GsonMessageRouterSource.java @@ -30,7 +30,8 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.dma public class GsonMessageRouterSource extends GsonMessageRouter implements MessageRouterSource { GsonMessageRouterSource( - String name, @NotNull MessageRouterDmaapInfo dmaapInfo, + String name, + @NotNull MessageRouterDmaapInfo dmaapInfo, @Nullable AafCredentials aafCredentials) { super(name, dmaapInfo, aafCredentials); } diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterDmaapInfo.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterDmaapInfo.java index 0ce0f80e..d887f964 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterDmaapInfo.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterDmaapInfo.java @@ -27,7 +27,6 @@ import org.jetbrains.annotations.Nullable; @Gson.TypeAdapters @Value.Immutable public interface MessageRouterDmaapInfo { - @SerializedName("topic_url") String topicUrl(); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSinkParser.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSinkParser.java index 1f518fe8..b1f037ab 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSinkParser.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSinkParser.java @@ -39,14 +39,14 @@ public final class MessageRouterSinkParser implements StreamFromGsonParser<Messa private final Gson gson; - public static MessageRouterSinkParser create() { - return new MessageRouterSinkParser(gsonInstance()); - } - private MessageRouterSinkParser(Gson gson) { this.gson = gson; } + public static MessageRouterSinkParser create() { + return new MessageRouterSinkParser(gsonInstance()); + } + @Override public MessageRouterSink unsafeParse(RawDataStream<JsonObject> input) { assertStreamType(input, MESSAGE_ROUTER_TYPE, DataStreamDirection.SINK); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSourceParser.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSourceParser.java index c6c1b22c..e6b964d0 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSourceParser.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/dmaap/mr/MessageRouterSourceParser.java @@ -42,14 +42,14 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.dma public final class MessageRouterSourceParser implements StreamFromGsonParser<MessageRouterSource> { private final Gson gson; - public static MessageRouterSourceParser create() { - return new MessageRouterSourceParser(gsonInstance()); - } - private MessageRouterSourceParser(Gson gson) { this.gson = gson; } + public static MessageRouterSourceParser create() { + return new MessageRouterSourceParser(gsonInstance()); + } + @Override public MessageRouterSource unsafeParse(RawDataStream<JsonObject> input) { assertStreamType(input, MESSAGE_ROUTER_TYPE, DataStreamDirection.SOURCE); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSinkParser.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSinkParser.java index 59373c45..00e9b500 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSinkParser.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSinkParser.java @@ -42,14 +42,14 @@ import static org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.strea public final class KafkaSinkParser implements StreamFromGsonParser<KafkaSink> { private final Gson gson; - public static KafkaSinkParser create() { - return new KafkaSinkParser(gsonInstance()); - } - private KafkaSinkParser(Gson gson) { this.gson = gson; } + public static KafkaSinkParser create() { + return new KafkaSinkParser(gsonInstance()); + } + @Override public KafkaSink unsafeParse(RawDataStream<JsonObject> input) { assertStreamType(input, KAFKA_TYPE, DataStreamDirection.SINK); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSourceParser.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSourceParser.java index 6ac1dc99..9465564b 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSourceParser.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/streams/gson/kafka/KafkaSourceParser.java @@ -42,14 +42,14 @@ import static org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.strea public final class KafkaSourceParser implements StreamFromGsonParser<KafkaSource> { private final Gson gson; - public static KafkaSourceParser create() { - return new KafkaSourceParser(gsonInstance()); - } - private KafkaSourceParser(Gson gson) { this.gson = gson; } + public static KafkaSourceParser create() { + return new KafkaSourceParser(gsonInstance()); + } + @Override public KafkaSource unsafeParse(RawDataStream<JsonObject> input) { assertStreamType(input, KAFKA_TYPE, DataStreamDirection.SOURCE); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSink.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSink.java index 74f88104..8f4a5339 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSink.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSink.java @@ -20,8 +20,6 @@ package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.dmaap; - -import org.immutables.gson.Gson; import org.immutables.value.Value; import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.SinkStream; diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSource.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSource.java index 66520f5d..ab802034 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSource.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/streams/dmaap/MessageRouterSource.java @@ -20,8 +20,6 @@ package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.dmaap; - -import org.immutables.gson.Gson; import org.immutables.value.Value; import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.streams.SourceStream; |