From d234dc1544375a38437c207db757274081d99a89 Mon Sep 17 00:00:00 2001
From: "mark.j.leonard" <mark.j.leonard@gmail.com>
Date: Mon, 18 Feb 2019 16:03:02 +0000
Subject: Remove unused test configuration files

Also fix some checkstyle warnings regarding Javadoc comments.

Issue-ID: AAI-2057
Change-Id: If654c63ec6a5f9888fdf597e51ad0cad9f363a90
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
---
 .../info-service/test-validation-service-beans.xml | 37 +++++++++-------
 .../resources/model-instance-mapping.json_conf     | 28 -------------
 .../model-instance-mapping.json_conf               | 28 +++++++++++++
 .../topic-config/test-topic-config-beans.xml       | 49 ----------------------
 .../topic-config/test-validation-service-beans.xml | 27 ++++--------
 .../topic-aai-data-integrity.properties            |  5 ++-
 .../topic-config/topic-aai-event.properties        |  5 ++-
 .../test-validation-service-beans.xml              | 36 +++++++++-------
 8 files changed, 82 insertions(+), 133 deletions(-)
 delete mode 100644 src/test/resources/model-instance-mapping.json_conf
 create mode 100644 src/test/resources/model-validation/model-instance-mapping.json_conf
 delete mode 100644 src/test/resources/topic-config/test-topic-config-beans.xml

(limited to 'src/test/resources')

diff --git a/src/test/resources/info-service/test-validation-service-beans.xml b/src/test/resources/info-service/test-validation-service-beans.xml
index d1c6ace..8b8fcd9 100644
--- a/src/test/resources/info-service/test-validation-service-beans.xml
+++ b/src/test/resources/info-service/test-validation-service-beans.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-============LICENSE_START===================================================
-Copyright (c) 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=====================================================
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+    Copyright (c) 2018-2019 European Software Marketing Ltd.
+    ================================================================================
+    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=========================================================
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -37,7 +42,7 @@ limitations under the License.
 	<bean id="topicAdminConfig" class="org.onap.aai.validation.config.TopicAdminConfig" />
 	<bean id="validationControllerConfig" class="org.onap.aai.validation.config.ValidationControllerConfig" />
 	<bean id="mappingFile" class="org.apache.commons.io.IOUtils" factory-method="toString">
-		<constructor-arg value="file:src/test/resources/model-instance-mapping.json_conf" type="java.io.InputStream" />
+		<constructor-arg value="file:src/test/resources/model-validation/model-instance-mapping.json_conf" type="java.io.InputStream" />
 	</bean>
 	<bean id="modelConfig" class="org.onap.aai.validation.config.ModelConfig">
 		<property name="modelCacheExpirySeconds" value="${model.cache.expirySeconds}" />
diff --git a/src/test/resources/model-instance-mapping.json_conf b/src/test/resources/model-instance-mapping.json_conf
deleted file mode 100644
index 12d39ea..0000000
--- a/src/test/resources/model-instance-mapping.json_conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-	{
-		"mappingType": "RELATIONSHIP",
-		"model": {
-			"root": "model-elements/model-element",
-			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
-			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
-			"filter": {
-				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
-				"valid": ["widget"]
-			}
-		},
-		"instance": {
-			"origin": "$.inventory-response-item[0]",
-			"root": "$.inventory-response-items.inventory-response-item[*]"
- 		}
- 	},
- 	{
-		"mappingType": "ATTRIBUTE",
-		"model": {
-			"value": "metadata/metadatum/metaname"
-		},
-		"instance": {
-			"origin": "$.inventory-response-item[0]",
-			"value": "$..extra-properties.metadatum[*].metaname"
-		}
-	}
-]
diff --git a/src/test/resources/model-validation/model-instance-mapping.json_conf b/src/test/resources/model-validation/model-instance-mapping.json_conf
new file mode 100644
index 0000000..12d39ea
--- /dev/null
+++ b/src/test/resources/model-validation/model-instance-mapping.json_conf
@@ -0,0 +1,28 @@
+[
+	{
+		"mappingType": "RELATIONSHIP",
+		"model": {
+			"root": "model-elements/model-element",
+			"id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']",
+			"value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']",
+			"filter": {
+				"path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']",
+				"valid": ["widget"]
+			}
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"root": "$.inventory-response-items.inventory-response-item[*]"
+ 		}
+ 	},
+ 	{
+		"mappingType": "ATTRIBUTE",
+		"model": {
+			"value": "metadata/metadatum/metaname"
+		},
+		"instance": {
+			"origin": "$.inventory-response-item[0]",
+			"value": "$..extra-properties.metadatum[*].metaname"
+		}
+	}
+]
diff --git a/src/test/resources/topic-config/test-topic-config-beans.xml b/src/test/resources/topic-config/test-topic-config-beans.xml
deleted file mode 100644
index 0466f81..0000000
--- a/src/test/resources/topic-config/test-topic-config-beans.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 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=====================================================
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-
-	<!-- TOPIC NAMES -->
-	<bean id="topicConfig" class="org.onap.aai.validation.config.TopicConfig">
-		<property name="consumerTopicNames">
-			<list>
-				<value>aai-event</value>
-				<value>aai-data-export</value>
-			</list>
-		</property>
-		<property name="publisherTopicNames">
-			<list>
-				<value>aai-data-integrity</value>
-			</list>
-		</property>
-	</bean>
-
-	<!-- DEFINE THE TOPIC PROPERTY FILES. Naming convention: topic-[topic name].properties. Each property must be pre-fixed with [topic name] -->
-	<bean id="topicProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-		<property name="locations">
-			<list>
-				<value>classpath:topic-config/topic-aai-event.properties</value>
-				<value>classpath:topic-config/topic-aai-data-export.properties</value>
-				<value>classpath:topic-config/topic-aai-data-integrity.properties</value>
-			</list>
-		</property>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/src/test/resources/topic-config/test-validation-service-beans.xml b/src/test/resources/topic-config/test-validation-service-beans.xml
index 9d880a3..ad7ad1f 100644
--- a/src/test/resources/topic-config/test-validation-service-beans.xml
+++ b/src/test/resources/topic-config/test-validation-service-beans.xml
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-============LICENSE_START===================================================
-Copyright (c) 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
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor" />
 
-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=====================================================
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	 <import resource="test-topic-config-beans.xml" />
+    <bean id="topicConfig" class="org.onap.aai.validation.config.TopicConfig" />
 
 </beans>
\ No newline at end of file
diff --git a/src/test/resources/topic-config/topic-aai-data-integrity.properties b/src/test/resources/topic-config/topic-aai-data-integrity.properties
index f5a5839..a8ca1ee 100644
--- a/src/test/resources/topic-config/topic-aai-data-integrity.properties
+++ b/src/test/resources/topic-config/topic-aai-data-integrity.properties
@@ -1,5 +1,5 @@
 # ============LICENSE_START===================================================
-# Copyright (c) 2018 Amdocs
+# Copyright (c) 2018-2019 European Software Marketing Ltd.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +19,5 @@ aai-data-integrity.host=integrity-dummy-host
 aai-data-integrity.publisher.partition=integrity-dummy-partition
 aai-data-integrity.username=integrity-dummy-username
 aai-data-integrity.password=integrity-dummy-password
-aai-data-integrity.transport.type=integrity-dummy-transport-type
\ No newline at end of file
+aai-data-integrity.transport.type=integrity-dummy-transport-type
+aai-data-integrity.protocol=http
diff --git a/src/test/resources/topic-config/topic-aai-event.properties b/src/test/resources/topic-config/topic-aai-event.properties
index 2779f13..72af926 100644
--- a/src/test/resources/topic-config/topic-aai-event.properties
+++ b/src/test/resources/topic-config/topic-aai-event.properties
@@ -1,5 +1,5 @@
 # ============LICENSE_START===================================================
-# Copyright (c) 2018 Amdocs
+# Copyright (c) 2018-2019 European Software Marketing Ltd.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,4 +20,5 @@ aai-event.username=event-dummy-username
 aai-event.password=event-dummy-password
 aai-event.consumer.group=event-dummy-consumer-group
 aai-event.consumer.id=event-dummy-consumer-id
-aai-event.transport.type=event-dummy-transport-type
\ No newline at end of file
+aai-event.transport.type=event-dummy-transport-type
+aai-event.protocol=event-dummy-protocol-type
\ No newline at end of file
diff --git a/src/test/resources/validation-result/test-validation-service-beans.xml b/src/test/resources/validation-result/test-validation-service-beans.xml
index 9a67d0a..9237a22 100644
--- a/src/test/resources/validation-result/test-validation-service-beans.xml
+++ b/src/test/resources/validation-result/test-validation-service-beans.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-============LICENSE_START===================================================
-Copyright (c) 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=====================================================
--->
 
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+    Copyright (c) 2018-2019 European Software Marketing Ltd.
+    ================================================================================
+    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=========================================================
+
+-->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-- 
cgit 1.2.3-korg