Move common code to router-core from DR

Change-Id: I5c13ca2b4173db02c0678dfbc0b4a8b168a570f8
Issue-ID: AAI-1339
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>

3 files changed, 1 insertions, 146 deletions

diff --git a/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java b/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java
index 665b8f9..1f71dcd 100644
--- a/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java
+++ b/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java
@@ -22,7 +22,7 @@ package org.onap.aai.datarouter.entity;
 

 import org.junit.Assert;

 import org.junit.Test;

-import org.onap.aai.datarouter.util.CrossEntityReference;

+import org.onap.aai.util.CrossEntityReference;

 

 import java.io.IOException;

 import java.security.NoSuchAlgorithmException;

@@ -96,34 +96,6 @@ public class AaiEventEntityTest {
     }

 

     @Test

-    public void testOxmEntityDescriptor(){

-        OxmEntityDescriptor descriptor = new OxmEntityDescriptor();

-        descriptor.setEntityName("entity-1");

-        Assert.assertEquals(descriptor.getEntityName(), "entity-1");

-

-        descriptor.setPrimaryKeyAttributeName(new ArrayList<String>());

-        Assert.assertTrue(descriptor.getPrimaryKeyAttributeName().size()==0);

-

-        Assert.assertFalse(descriptor.hasSearchableAttributes());

-

-        List<String> searchableAttr = new ArrayList<String>();

-        searchableAttr.add("search");

-        descriptor.setSearchableAttributes(searchableAttr);

-        Assert.assertTrue(descriptor.getSearchableAttributes().size()==1);

-

-        Assert.assertTrue(descriptor.hasSearchableAttributes());

-

-        CrossEntityReference ref = new CrossEntityReference();

-        descriptor.setCrossEntityReference(ref);

-        Assert.assertEquals(descriptor.getCrossEntityReference(), ref);

-

-        descriptor.setSuggestableEntity(true);

-        Assert.assertTrue(descriptor.isSuggestableEntity());

-

-        Assert.assertNotNull(descriptor.toString());

-    }

-

-    @Test

     public void testPolicyResponse(){

         PolicyResponse response = new PolicyResponse(PolicyResponse.ResponseType.SUCCESS, "response-data");

 

diff --git a/src/test/java/org/onap/aai/datarouter/schema/OxmModelLoaderTest.java b/src/test/java/org/onap/aai/datarouter/schema/OxmModelLoaderTest.java
deleted file mode 100644
index a92d739..0000000
--- a/src/test/java/org/onap/aai/datarouter/schema/OxmModelLoaderTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ================================================================================
- * 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.aai.datarouter.schema;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import java.util.ArrayList;
-import org.eclipse.persistence.dynamic.DynamicType;
-import org.eclipse.persistence.internal.helper.DatabaseField;
-import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
-import org.eclipse.persistence.mappings.DatabaseMapping;
-import org.junit.Test;
-import org.onap.aai.datarouter.schema.OxmModelLoader;
-import org.onap.aai.datarouter.util.EntityOxmReferenceHelper;
-import org.onap.aai.datarouter.util.ExternalOxmModelProcessor;
-import org.onap.aai.setup.Version;
-
-public class OxmModelLoaderTest {
-
-    @Test
-    public void testLoadingMultipleOxmFiles() {
-        ArrayList<ExternalOxmModelProcessor> externalOxmModelProcessors = new ArrayList<ExternalOxmModelProcessor>();
-        externalOxmModelProcessors.add(EntityOxmReferenceHelper.getInstance());
-        OxmModelLoader.registerExternalOxmModelProcessors(externalOxmModelProcessors);
-        OxmModelLoader.loadModels();
-
-        DynamicJAXBContext jaxbContext = OxmModelLoader.getContextForVersion(Version.getLatest().toString());
-
-        DynamicType pserver = jaxbContext.getDynamicType("Pserver");
-        DynamicType genericVnf = jaxbContext.getDynamicType("GenericVnf");
-
-        assertNotNull(pserver);
-        assertNotNull(genericVnf);
-
-        DatabaseMapping mapping = pserver.getDescriptor().getMappings().firstElement();
-        if (mapping.isAbstractDirectMapping()) {
-            DatabaseField f = mapping.getField();
-            String keyName = f.getName().substring(0, f.getName().indexOf("/"));
-            assertTrue(keyName.equals("hostname"));
-        }
-
-        mapping = genericVnf.getDescriptor().getMappings().firstElement();
-        if (mapping.isAbstractDirectMapping()) {
-            DatabaseField f = mapping.getField();
-            String keyName = f.getName().substring(0, f.getName().indexOf("/"));
-            assertTrue(keyName.equals("vnf-id"));
-        }
-
-    }
-}
diff --git a/src/test/java/org/onap/aai/datarouter/util/CrossEntityReferenceTest.java b/src/test/java/org/onap/aai/datarouter/util/CrossEntityReferenceTest.java
deleted file mode 100644
index 3e0593f..0000000
--- a/src/test/java/org/onap/aai/datarouter/util/CrossEntityReferenceTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**

- * ============LICENSE_START=======================================================

- * org.onap.aai

- * ================================================================================

- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.

- * Copyright © 2017-2018 Amdocs

- * ================================================================================

- * 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.aai.datarouter.util;

-

-import org.junit.Assert;

-import org.junit.Test;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import static org.junit.Assert.*;

-

-public class CrossEntityReferenceTest {

-

-    @Test

-    public void testCrossEntityReference() {

-

-        CrossEntityReference reference = new CrossEntityReference();

-

-        reference.setTargetEntityType("entity-type");

-        Assert.assertEquals(reference.getTargetEntityType(),"entity-type");

-

-        reference.setAttributeNames(new ArrayList<String>());

-        Assert.assertTrue(reference.getAttributeNames().size()==0);

-

-        reference.addAttributeName("attribute");

-        Assert.assertEquals(reference.getAttributeNames().get(0),"attribute");

-    }

-

-

-}
\ No newline at end of file