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, 89 deletions

diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/AaiServiceInstanceResultModelTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/AaiServiceInstanceResultModelTest.java
deleted file mode 100644
index 5f9ca14d..00000000
--- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/AaiServiceInstanceResultModelTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2019 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 org.junit.jupiter.api.Test;
-import org.onap.dcaegen2.services.prh.model.utils.PrhModelAwareGsonBuilder;
-
-import java.io.InputStreamReader;
-import java.util.Objects;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class AaiServiceInstanceResultModelTest {
-
-    @Test
-    void shouldParseAaiServiceInstance() {
-        AaiServiceInstanceResultModel serviceInstance = PrhModelAwareGsonBuilder.createGson().fromJson(
-                new InputStreamReader(Objects.requireNonNull(
-                        ClassLoader.getSystemResourceAsStream("some_aai_service_instance.json"))),
-                AaiServiceInstanceResultModel.class);
-
-        assertThat(serviceInstance.getServiceInstanceId()).isEqualTo("some serviceInstanceId");
-        assertThat(serviceInstance.getServiceInstanceName()).isEqualTo("some serviceInstanceName");
-        assertThat(serviceInstance.getServiceType()).isEqualTo("some serviceType");
-        assertThat(serviceInstance.getServiceRole()).isEqualTo("some serviceRole");
-        assertThat(serviceInstance.getEnvironmentContext()).isEqualTo("some environmentContext");
-        assertThat(serviceInstance.getWorkloadContext()).isEqualTo("some workloadContext");
-        assertThat(serviceInstance.getCreatedAt()).isEqualTo("some createdAt");
-        assertThat(serviceInstance.getUpdatedAt()).isEqualTo("some updatedAt");
-        assertThat(serviceInstance.getDescription()).isEqualTo("some description");
-        assertThat(serviceInstance.getModelInvariantId()).isEqualTo("some modelInvariantId");
-        assertThat(serviceInstance.getModelVersionId()).isEqualTo("some modelVersionId");
-        assertThat(serviceInstance.getPersonaModelVersion()).isEqualTo("some personaModelVersion");
-        assertThat(serviceInstance.getWidgetModelId()).isEqualTo("some widgetModelId");
-        assertThat(serviceInstance.getWidgetModelVersion()).isEqualTo("some widgetModelVersion");
-        assertThat(serviceInstance.getBandwidthTotal()).isEqualTo("some bandwidthTotal");
-        assertThat(serviceInstance.getBandwidthUpWan1()).isEqualTo("some bandwidthUpWan1");
-        assertThat(serviceInstance.getBandwidthDownWan1()).isEqualTo("some bandwidthDownWan1");
-        assertThat(serviceInstance.getBandwidthUpWan2()).isEqualTo("some bandwidthUpWan2");
-        assertThat(serviceInstance.getBandwidthDownWan2()).isEqualTo("some bandwidthDownWan2");
-        assertThat(serviceInstance.getVhnPortalUrl()).isEqualTo("some vhnPortalUrl");
-        assertThat(serviceInstance.getServiceInstanceLocationId()).isEqualTo("some serviceInstanceLocationId");
-        assertThat(serviceInstance.getResourceVersion()).isEqualTo("some resourceVersion");
-        assertThat(serviceInstance.getSelflink()).isEqualTo("some selflink");
-        assertThat(serviceInstance.getOrchestrationStatus()).isEqualTo("some orchestrationStatus");
-
-        RelationshipDict relationshipDict = serviceInstance.getRelationshipList().getRelationship().get(0);
-        assertThat(relationshipDict.getRelatedTo()).isEqualTo("some relatedTo");
-        assertThat(relationshipDict.getRelationshipData()).hasSize(1);
-        RelationshipData relationshipData = relationshipDict.getRelationshipData().get(0);
-        assertThat(relationshipData.getRelationshipKey()).isEqualTo("some relationshipKey");
-        assertThat(relationshipData.getRelationshipValue()).isEqualTo("some relationshipValue");
-    }
-
-
-    @Test
-    void shouldProvideEmptyRelationshipListForEmptyJson() {
-        Gson gson = PrhModelAwareGsonBuilder.createGson();
-        AaiServiceInstanceResultModel serviceInstance = gson.fromJson("{}", AaiServiceInstanceResultModel.class);
-        assertThat(serviceInstance.getRelationshipList()).isNotNull();
-        assertThat(serviceInstance.getRelationshipList().getRelationship()).isEmpty();
-    }
-
-    @Test
-    void shouldIgnoreUnexpectedFieldsInJson() {
-        Gson gson = PrhModelAwareGsonBuilder.createGson();
-        gson.fromJson("{\"foo\":\"bar\"}", AaiServiceInstanceResultModel.class);
-    }
-
-}
\ No newline at end of file