diff options
author | Lusheng Ji <lji@research.att.com> | 2018-05-22 16:13:32 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-05-22 16:13:32 +0000 |
commit | 58d7f019d3ef6d378c9c3625773f49e79060e20f (patch) | |
tree | c7e298bada9cf31463544ead582ee4bb8f6c79b7 /prh-commons | |
parent | 69da977930bf2ec5a7665f0144e698118c3e0f1b (diff) | |
parent | 91292c21d8ee51c3840ed455955636b7ceda36fb (diff) |
Merge "Removing warnings related to optionals"
Diffstat (limited to 'prh-commons')
2 files changed, 7 insertions, 7 deletions
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java index c8753177..9e272aae 100644 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java @@ -22,21 +22,21 @@ package org.onap.dcaegen2.services.prh.model; public class ConsumerDmaapModelForUnitTest implements ConsumerDmaapModel { - private String pnfName = "NOKnhfsadhff"; - private String ipv4 = "11.22.33.155"; - private String ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; + private final String PNF_NAME = "NOKnhfsadhff"; + private final String IPv4 = "256.22.33.155"; + private final String IPv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; public String getPnfName() { - return pnfName; + return PNF_NAME; } public String getIpv4() { - return ipv4; + return IPv4; } public String getIpv6() { - return ipv6; + return IPv6; } } diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java index 2b9f2a97..6f99f1c7 100644 --- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java +++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; public class CommonFunctionsTest { private ConsumerDmaapModel model = new ConsumerDmaapModelForUnitTest(); - private String expectedResult = "{\"pnfName\":\"NOKnhfsadhff\",\"ipv4\":\"11.22.33.155\",\"ipv6\":\"2001:0db8:85a3:0000:0000:8a2e:0370:7334\"}"; + private String expectedResult = "{\"PNF_NAME\":\"NOKnhfsadhff\",\"IPv4\":\"256.22.33.155\",\"IPv6\":\"2001:0db8:85a3:0000:0000:8a2e:0370:7334\"}"; @Test public void createJsonBody_shouldReturnJsonInString() { |