From c794fbc7ea10e7c6191ecd80978512ce95f35dc0 Mon Sep 17 00:00:00 2001 From: wasala Date: Thu, 17 May 2018 08:06:17 +0200 Subject: Change package in prh-commons module Move package org.onap.dcaegen2.services to org.onap.dcaegen2.services.prh Change-Id: Idb13c5f1173897fceb1a8544dd893f6f9fee2c52 Issue-ID: DCAEGEN2-396 Signed-off-by: wasala --- .../dcaegen2/services/model/CommonFunctions.java | 36 ------------------- .../services/model/ConsumerDmaapModel.java | 42 ---------------------- .../model/ConsumerDmaapModelForUnitTest.java | 42 ---------------------- .../services/prh/model/CommonFunctions.java | 36 +++++++++++++++++++ .../services/prh/model/ConsumerDmaapModel.java | 42 ++++++++++++++++++++++ .../prh/model/ConsumerDmaapModelForUnitTest.java | 42 ++++++++++++++++++++++ 6 files changed, 120 insertions(+), 120 deletions(-) delete mode 100644 prh-commons/src/main/java/org/onap/dcaegen2/services/model/CommonFunctions.java delete mode 100644 prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModel.java delete mode 100644 prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModelForUnitTest.java create mode 100644 prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java create mode 100644 prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java create mode 100644 prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java (limited to 'prh-commons/src/main') diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/model/CommonFunctions.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/model/CommonFunctions.java deleted file mode 100644 index d10ab320..00000000 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/model/CommonFunctions.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.model; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -public class CommonFunctions { - - private static Gson gson = new GsonBuilder().create(); - - - private CommonFunctions() {} - - public static String createJsonBody(ConsumerDmaapModel consumerDmaapModel) { - return gson.toJson(consumerDmaapModel); - } -} diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModel.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModel.java deleted file mode 100644 index 3143362a..00000000 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModel.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.dcaegen2.services.model; - -import com.google.gson.annotations.SerializedName; -import org.immutables.gson.Gson; -import org.immutables.value.Value; - -/** - * @author Przemysław Wąsala on 5/8/18 - */ - -@Value.Immutable -@Gson.TypeAdapters -public interface ConsumerDmaapModel { - - @SerializedName("pnf-name") - String getPnfName(); - - @SerializedName("ipaddress-v4-oam") - String getIpv4(); - - @SerializedName("ipaddress-v6-oam") - String getIpv6(); -} diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModelForUnitTest.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModelForUnitTest.java deleted file mode 100644 index b14e324e..00000000 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/model/ConsumerDmaapModelForUnitTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.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"; - - - public String getPnfName() { - return pnfName; - } - - public String getIpv4() { - return ipv4; - } - - public String getIpv6() { - return ipv6; - } - -} diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java new file mode 100644 index 00000000..d5156e3a --- /dev/null +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java @@ -0,0 +1,36 @@ +/* + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.dcaegen2.services.prh.model; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +public class CommonFunctions { + + private static Gson gson = new GsonBuilder().create(); + + + private CommonFunctions() {} + + public static String createJsonBody(ConsumerDmaapModel consumerDmaapModel) { + return gson.toJson(consumerDmaapModel); + } +} 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 new file mode 100644 index 00000000..dae0e59e --- /dev/null +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java @@ -0,0 +1,42 @@ +/* + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcaegen2.services.prh.model; + +import com.google.gson.annotations.SerializedName; +import org.immutables.gson.Gson; +import org.immutables.value.Value; + +/** + * @author Przemysław Wąsala on 5/8/18 + */ + +@Value.Immutable +@Gson.TypeAdapters +public interface ConsumerDmaapModel { + + @SerializedName("pnf-name") + String getPnfName(); + + @SerializedName("ipaddress-v4-oam") + String getIpv4(); + + @SerializedName("ipaddress-v6-oam") + String getIpv6(); +} 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 new file mode 100644 index 00000000..c8753177 --- /dev/null +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java @@ -0,0 +1,42 @@ +/*- + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +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"; + + + public String getPnfName() { + return pnfName; + } + + public String getIpv4() { + return ipv4; + } + + public String getIpv6() { + return ipv6; + } + +} -- cgit 1.2.3-korg