Refactor AaiClient API - package restructure

- Reorganized aaiclient related classes between api/impl/main packages

Issue-ID: DCAEGEN2-1955
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
Change-Id: Ie68f74cd94a6de0806c192046c1746af25979170

1 files changed, 0 insertions, 82 deletions

diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderTest.java
deleted file mode 100644
index 769e1673..00000000
--- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/PnfReadyJsonBodyBuilderTest.java
+++ /dev/null
@@ -1,82 +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.prh.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import org.junit.jupiter.api.Test;
-
-class PnfReadyJsonBodyBuilderTest {
-
-    @Test
-    void createJsonBody_shouldReturnJsonInString() {
-
-        JsonObject jsonObject = parse("{\n"
-            + "        \"attachmentPoint\": \"bla-bla-30-3\",\n"
-            + "        \"cvlan\": \"678\",\n"
-            + "        \"svlan\": \"1005\"\n"
-            + "      }");
-
-        ConsumerDmaapModel model = ImmutableConsumerDmaapModel.builder()
-            .correlationId("NOKnhfsadhff")
-            .additionalFields(jsonObject)
-            .build();
-
-        JsonObject expectedResult = parse("{"
-            + "\"correlationId\":\"NOKnhfsadhff\","
-            + "\"additionalFields\":{\"attachmentPoint\":\"bla-bla-30-3\",\"cvlan\":\"678\",\"svlan\":\"1005\"}"
-            + "}");
-
-        assertEquals(expectedResult, new PnfReadyJsonBodyBuilder().createJsonBody(model));
-    }
-
-    @Test
-    void createJsonBodyWithNullableFieldsNotSet_shouldReturnJsonInString() {
-
-        ConsumerDmaapModel model = ImmutableConsumerDmaapModel.builder()
-            .correlationId("NOKnhfsadhff")
-            .build();
-
-        JsonObject expectedResult = parse("{\"correlationId\":\"NOKnhfsadhff\"}");
-
-        assertEquals(expectedResult, new PnfReadyJsonBodyBuilder().createJsonBody(model));
-    }
-
-    @Test
-    void createJsonBodyWithEmptyOptionalPnfRegistrationFields_shouldReturnJsonInString() {
-        JsonObject jsonObject = new JsonObject();
-
-        ConsumerDmaapModel model = ImmutableConsumerDmaapModel.builder()
-            .correlationId("NOKnhfsadhff")
-            .additionalFields(jsonObject)
-            .build();
-
-        JsonObject expectedResult = parse("{\"correlationId\":\"NOKnhfsadhff\"}");
-
-        assertEquals(expectedResult, new PnfReadyJsonBodyBuilder().createJsonBody(model));
-    }
-
-    private static JsonObject parse(String jsonString) {
-        return new JsonParser().parse(jsonString).getAsJsonObject();
-    }
-}