Various Sonar and Checkstyle issues

Issue-ID: AAI-2057

Change-Id: I3b24ce6e5baddb409e3b1d89f411ee934c465284
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

5 files changed, 12 insertions, 21 deletions

diff --git a/src/test/resources/aai-environment.properties b/src/test/resources/aai-environment.properties
index 463a2b0..ddcc728 100644
--- a/src/test/resources/aai-environment.properties
+++ b/src/test/resources/aai-environment.properties
@@ -1,20 +1,23 @@
-# ============LICENSE_START===================================================
-# Copyright (c) 2018 Amdocs
-# ============================================================================
+# ============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
+#      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_END=========================================================
 
-# This file is used by various tests (src/test and src/integration-test) as it loaded from the classpath
+# This file is used by various tests (loaded from the classpath)
 host=localhost
 port=8443
 httpProtocol=file
diff --git a/src/test/resources/data-dictionary/schemaIngest.properties b/src/test/resources/data-dictionary/schemaIngest.properties
index 8df810a..317f478 100644
--- a/src/test/resources/data-dictionary/schemaIngest.properties
+++ b/src/test/resources/data-dictionary/schemaIngest.properties
@@ -39,10 +39,4 @@ schema.version.edge.label.start=v10
 # Specifies the version that the application should default to
 schema.version.api.default=v9
 
-schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
-schema.service.nodes.endpoint=nodes?version=
-schema.service.edges.endpoint=edgerules?version=
-schema.service.versions.endpoint=versions
 
-schema.service.ssl.key-store=src/integration-test/resources/authentication/aai-client-cert.p12
-schema.service.ssl.trust-store=src/integration-test/resources/authentication/tomcat_keystore
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 47c6154..4026543 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -171,7 +171,7 @@ limitations under the License.
 	<!-- Other Loggers that may help troubleshoot -->
 	<logger name="org.apache" level="WARN" />
 	<logger name="org.apache.commons" level="WARN" />
-    <logger name="com.jayway.jsonpath.internal.path.CompiledPath" level="WARN" />
+	<logger name="com.jayway.jsonpath.internal.path.CompiledPath" level="WARN" />
 
 	<!-- logback internals logging -->
 	<logger name="ch.qos.logback.classic" level="WARN" />
diff --git a/src/test/resources/model-validation/instance-validator/schemaIngest.properties b/src/test/resources/model-validation/instance-validator/schemaIngest.properties
index 8df810a..317f478 100644
--- a/src/test/resources/model-validation/instance-validator/schemaIngest.properties
+++ b/src/test/resources/model-validation/instance-validator/schemaIngest.properties
@@ -39,10 +39,4 @@ schema.version.edge.label.start=v10
 # Specifies the version that the application should default to
 schema.version.api.default=v9
 
-schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
-schema.service.nodes.endpoint=nodes?version=
-schema.service.edges.endpoint=edgerules?version=
-schema.service.versions.endpoint=versions
 
-schema.service.ssl.key-store=src/integration-test/resources/authentication/aai-client-cert.p12
-schema.service.ssl.trust-store=src/integration-test/resources/authentication/tomcat_keystore
diff --git a/src/test/resources/oxm-reader/schemaIngest.properties b/src/test/resources/oxm-reader/schemaIngest.properties
index 43e755b..34c8796 100644
--- a/src/test/resources/oxm-reader/schemaIngest.properties
+++ b/src/test/resources/oxm-reader/schemaIngest.properties
@@ -28,5 +28,5 @@ schema.service.nodes.endpoint=nodes?version=
 schema.service.edges.endpoint=edgerules?version=
 schema.service.versions.endpoint=versions
 
-schema.service.ssl.key-store=appconfig-local/auth/aai-client-cert.p12
-schema.service.ssl.trust-store=appconfig-local/auth/tomcat_keystore
\ No newline at end of file
+schema.service.ssl.key-store=
+schema.service.ssl.trust-store=
\ No newline at end of file