diff options
| author |   Piotr Wielebski <piotr.wielebski@nokia.com> | 2019-03-22 08:35:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-22 08:35:27 +0000 |
| commit | 941db7477e728b28631c98b851bff936a5bcecd4 (patch) | |
| tree | 713b7916dbf008617fc751bb036ee4cea288de65 /prh-commons/src/main | |
| parent | 9048ed0f0cfddf05dffb775c83d062461667e588 (diff) | |
| parent | 6faaa947cbff7bc1d33dd7282f793b809f3af29e (diff) | |
Merge "Remove params"
Diffstat (limited to 'prh-commons/src/main')
2 files changed, 7 insertions, 7 deletions
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java index 585190c7..b519c3a5 100644 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java @@ -47,21 +47,27 @@ public interface ConsumerDmaapModel extends AaiModel, DmaapModel { @SerializedName(value = "ipaddress-v6-oam", alternate = "ipaddress-v6-oam") String getIpv6(); + @Nullable @SerializedName(value = "serial-number", alternate = "serial-number") String getSerialNumber(); + @Nullable @SerializedName(value = "equip-vendor", alternate = "equip-vendor") String getEquipVendor(); + @Nullable @SerializedName(value = "equip-model", alternate = "equip-model") String getEquipModel(); + @Nullable @SerializedName(value = "equip-type", alternate = "equip-type") String getEquipType(); + @Nullable @SerializedName(value = "nf-role", alternate = "nf-role") String getNfRole(); + @Nullable @SerializedName(value = "sw-version", alternate = "sw-version") String getSwVersion(); diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderImpl.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderImpl.java index fe812a41..8584f01f 100644 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderImpl.java +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderImpl.java @@ -41,13 +41,7 @@ public class PnfReadyJsonBodyBuilderImpl implements JsonBodyBuilder<ConsumerDmaa GsonBuilder gsonBuilder = new GsonBuilder(); ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory); Builder builder = ImmutableConsumerDmaapModel.builder() - .correlationId(consumerDmaapModel.getCorrelationId()) - .serialNumber(consumerDmaapModel.getSerialNumber()) - .equipVendor(consumerDmaapModel.getEquipVendor()) - .equipModel(consumerDmaapModel.getEquipModel()) - .equipType(consumerDmaapModel.getEquipType()) - .nfRole(consumerDmaapModel.getNfRole()) - .swVersion(consumerDmaapModel.getSwVersion()); + .correlationId(consumerDmaapModel.getCorrelationId()); JsonObject additionalFields = consumerDmaapModel.getAdditionalFields(); if(additionalFields != null && !additionalFields.equals(new JsonObject())) { |