summaryrefslogtreecommitdiffstats
path: root/prh-commons/src/main
diff options
context:
space:
mode:
authorJoanna Jeremicz <joanna.jeremicz@nokia.com>2019-03-21 13:29:57 +0100
committerJoanna Jeremicz <joanna.jeremicz@nokia.com>2019-03-21 13:29:57 +0100
commit6faaa947cbff7bc1d33dd7282f793b809f3af29e (patch)
treeda9b1bc7c607cdf9b6f340044befb52ac7be25d9 /prh-commons/src/main
parentbccafdc99094a8ff9107f242b31f80e5a839b5c2 (diff)
Remove params
Remove redundant parameters from Pnf_ready event Change-Id: I755b632b34cc2a07233c7043bc2ecf16becb877c Issue-ID: DCAEGEN2-1312 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Diffstat (limited to 'prh-commons/src/main')
-rw-r--r--prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java6
-rw-r--r--prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderImpl.java8
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())) {