Enhancements for the aai-common library

Issue-ID: AAI-2806
Change-Id: I2dbb46b897b35136ac1bb802978d3f974af1b307
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

6 files changed, 379 insertions, 44 deletions

diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockProvider.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockProvider.java
index f0fed324..09b8d3a7 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockProvider.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockProvider.java
@@ -35,21 +35,6 @@ public class MockProvider {
     @Value("${mock.filename}")
     private String fileName;
 
-    @Autowired
-    private RestClient restClient;
-
-    @Bean
-    public RestClientFactory restClientFactory() {
-
-        return new RestClientFactory() {
-            @Override
-            public RestClient getRestClient(String clientType) {
-                return restClient;
-
-            }
-        };
-    }
-
     @Bean(name = "restClient")
     @ConditionalOnProperty(name = "schema.service.client", havingValue = "mock-no-auth")
     public RestClient getSchemaServiceNoAuthClient() {
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
index 52e6364b..6c23301b 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
@@ -24,7 +24,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
 import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
 
-import com.att.eelf.configuration.EELFLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -288,7 +289,7 @@ public class MockRestClient extends RestClient {
         return null;
     }
 
-    protected EELFLogger getLogger() {
+    protected Logger getLogger() {
         return null;
     }
 
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/RestClientTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/RestClientTest.java
deleted file mode 100644
index 36b8fb3e..00000000
--- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/RestClientTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T 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.aai.restclient;
-
-public class RestClientTest {
-
-}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
index b7688472..af94765f 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
@@ -27,12 +27,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:forWiringTests/testUsingPropFileContext.xml"})
-@TestPropertySource(locations="classpath:forWiringTests/schema-ingest-for-xml-test.properties")
 public class SchemaLocationsBeanXMLSetterWithPropFileTest {
     @Autowired
     SchemaLocationsBean bean;
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v16.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v16.json
new file mode 100644
index 00000000..0932014c
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v16.json
@@ -0,0 +1,275 @@
+{
+	"rules": [
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eats",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eatz",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "baz",
+			"label": "isVeryHappyAbout",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "quux",
+			"to": "foo",
+			"label": "dancesWith",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+        {
+            "from": "foo",
+            "to": "dog",
+            "label": "pets",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe"
+        },
+        {
+            "from": "dog",
+            "to": "puppy",
+            "label": "caresFor",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe",
+            "default": "true"
+        },
+        {
+            "from": "l-interface",
+            "to": "logical-link",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
+            "from": "logical-link",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description":""
+        },
+        {
+            "from": "logical-link",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description":""
+        },
+        {
+            "from": "l-interface",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
+            "from": "lag-interface",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
+            "from": "bloop",
+            "to": "bloop",
+            "label": "links",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "for testing same type direction flip requirement"
+        },
+        {
+            "from": "parent",
+            "to": "notation",
+            "label": "has",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains notation"
+        },
+        {
+            "from": "not-notation",
+            "to": "parent",
+            "label": "contains",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains not-notation"
+        },
+        {
+            "from": "parent",
+            "to": "out-out",
+            "label": "eats",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains out-out"
+        },
+        {
+            "from": "parent",
+            "to": "in-in",
+            "label": "verbs",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains in-in"
+        },
+        {
+            "from": "out-in",
+            "to": "parent",
+            "label": "alarms",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains out-in"
+        },
+        {
+            "from": "in-out",
+            "to": "parent",
+            "label": "befriends",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains in-out"
+        },
+        {
+            "from": "parent",
+            "to": "grandparent1",
+            "label": "has",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent1"
+        },
+        {
+            "from": "grandparent2",
+            "to": "parent",
+            "label": "contains",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent2"
+        },
+        {
+            "from": "parent",
+            "to": "grandparent3",
+            "label": "eats",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent3"
+        },
+        {
+            "from": "parent",
+            "to": "grandparent4",
+            "label": "verbs",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent4"
+        },
+        {
+            "from": "grandparent5",
+            "to": "parent",
+            "label": "alarms",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent5"
+        },
+        {
+            "from": "grandparent6",
+            "to": "parent",
+            "label": "befriends",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent6"
+        }
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v16.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v16.xml
new file mode 100644
index 00000000..b167ce55
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v16.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T 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=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v16" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v16" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+