diff options
| author |   pwielebs <piotr.wielebski@nokia.com> | 2019-01-07 13:48:18 +0100 |
|---|---|---|
| committer |   elinuxhenrik <henrik.b.andersson@est.tech> | 2019-01-25 14:04:43 +0100 |
| commit | 8a84a9d39fe71984bd5d861e8c865e748ca3df30 (patch) | |
| tree | 76e50367dffde229a5f2bc427f3544bf60002d3a /datafile-commons/src/main/java | |
| parent | a224b4adbe65b476cdbd74efb3169aacbf292382 (diff) | |
Integration with SDK
* New fields added to DmaapPublisherConfiguraion
* New fields added to DmaapConsumerConfiguration
* Dmaap Consumer web client replaced by SDK's consumer web client
* UTs aligned
* Disable enforcer plugin in DFC
* Update oparent to 1.2.1
Change-Id: I3569180c15227bc2c8df74fd070571b0aa56fa04
Issue-ID: DCAEGEN2-1096
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Diffstat (limited to 'datafile-commons/src/main/java')
2 files changed, 5 insertions, 5 deletions
diff --git a/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/CommonFunctions.java b/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/CommonFunctions.java index 3be7bcf6..801f1705 100644 --- a/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/CommonFunctions.java +++ b/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/CommonFunctions.java @@ -20,15 +20,14 @@ package org.onap.dcaegen2.collectors.datafile.model; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder; -public class CommonFunctions { +public class CommonFunctions implements JsonBodyBuilder<ConsumerDmaapModel> { private static Gson gson = new GsonBuilder().serializeNulls().create(); - private CommonFunctions() {} - - public static String createJsonBody(ConsumerDmaapModel consumerDmaapModel) { + public String createJsonBody(ConsumerDmaapModel consumerDmaapModel) { return gson.toJson(consumerDmaapModel); } } diff --git a/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/ConsumerDmaapModel.java b/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/ConsumerDmaapModel.java index 62315602..883a73af 100644 --- a/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/ConsumerDmaapModel.java +++ b/datafile-commons/src/main/java/org/onap/dcaegen2/collectors/datafile/model/ConsumerDmaapModel.java @@ -20,6 +20,7 @@ import com.google.gson.annotations.SerializedName; import org.immutables.gson.Gson; import org.immutables.value.Value; +import org.onap.dcaegen2.services.sdk.rest.services.model.DmaapModel; /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 5/8/18 @@ -28,7 +29,7 @@ import org.immutables.value.Value; @Value.Immutable @Gson.TypeAdapters -public interface ConsumerDmaapModel { +public interface ConsumerDmaapModel extends DmaapModel { @SerializedName("productName") String getProductName(); |