From a45eb46d8e0cfc228e3d56523c101152821badce Mon Sep 17 00:00:00 2001
From: "Kotagiri, Ramprasad (rp5662)" <rp5662@att.com>
Date: Mon, 31 Aug 2020 16:33:58 -0400
Subject: fix issue with deploying server TLS certificates

Issue-ID: DCAEGEN2-2298

Change-Id: I45cb6684902f7eedfb84a390717bdfb3dd51f746
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
---
 ccsdk-app-common/.checkstyle                             | 16 ++++++++--------
 ccsdk-app-common/pom.xml                                 |  3 +++
 .../ccsdk/dashboard/rest/CloudifyRestClientImpl.java     |  3 ++-
 .../ccsdk/dashboard/rest/CloudifyRestClientImplTest.java |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'ccsdk-app-common')

diff --git a/ccsdk-app-common/.checkstyle b/ccsdk-app-common/.checkstyle
index 327b388..46eb53c 100644
--- a/ccsdk-app-common/.checkstyle
+++ b/ccsdk-app-common/.checkstyle
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-  <local-check-config name="maven-checkstyle-plugin onap-license" location="jar:file:/Users/dt5972/.m2/repository/org/onap/oparent/checkstyle/1.2.3/checkstyle-1.2.3.jar!/onap-checkstyle/check-license.xml" type="remote" description="maven-checkstyle-plugin configuration onap-license">
+  <local-check-config name="maven-checkstyle-plugin onap-license" location="jar:file:/C:/Users/rp5662/.m2/repository/org/onap/oparent/checkstyle/2.0.0/checkstyle-2.0.0.jar!/onap-checkstyle/check-license.xml" type="remote" description="maven-checkstyle-plugin configuration onap-license">
+    <property name="checkstyle.header.file" value="C:\Users\rp5662\Documents\workspace-java11\.metadata\.plugins\org.eclipse.core.resources\.projects\ccsdk-app-common\com.basistech.m2e.code.quality.checkstyleConfigurator\checkstyle-header-onap-license.txt"/>
     <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
-    <property name="checkstyle.header.file" value="/Users/dt5972/eclipse/onap/.metadata/.plugins/org.eclipse.core.resources/.projects/ccsdk-app-common/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-onap-license.txt"/>
   </local-check-config>
-  <local-check-config name="maven-checkstyle-plugin onap-java-style" location="jar:file:/Users/dt5972/.m2/repository/org/onap/oparent/checkstyle/1.2.3/checkstyle-1.2.3.jar!/onap-checkstyle/onap-java-style.xml" type="remote" description="maven-checkstyle-plugin configuration onap-java-style">
+  <local-check-config name="maven-checkstyle-plugin onap-java-style" location="jar:file:/C:/Users/rp5662/.m2/repository/org/onap/oparent/checkstyle/2.0.0/checkstyle-2.0.0.jar!/onap-checkstyle/onap-java-style.xml" type="remote" description="maven-checkstyle-plugin configuration onap-java-style">
+    <property name="checkstyle.header.file" value="C:\Users\rp5662\Documents\workspace-java11\.metadata\.plugins\org.eclipse.core.resources\.projects\ccsdk-app-common\com.basistech.m2e.code.quality.checkstyleConfigurator\checkstyle-header-onap-java-style.txt"/>
     <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
-    <property name="checkstyle.header.file" value="/Users/dt5972/eclipse/onap/.metadata/.plugins/org.eclipse.core.resources/.projects/ccsdk-app-common/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-onap-java-style.txt"/>
   </local-check-config>
   <fileset name="java-sources-onap-license" enabled="true" check-config-name="maven-checkstyle-plugin onap-license" local="true">
-    <file-match-pattern match-pattern="^src/test/java/.*\/.*\.java" include-pattern="true"/>
-    <file-match-pattern match-pattern="^src/main/java/.*\/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/java/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java/.*\.java" include-pattern="true"/>
   </fileset>
   <fileset name="java-sources-onap-java-style" enabled="true" check-config-name="maven-checkstyle-plugin onap-java-style" local="true">
-    <file-match-pattern match-pattern="^src/test/java/.*\/.*\.java" include-pattern="true"/>
-    <file-match-pattern match-pattern="^src/main/java/.*\/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/java/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java/.*\.java" include-pattern="true"/>
     <file-match-pattern match-pattern="^src/main/resources.*\.properties" include-pattern="true"/>
     <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
   </fileset>
diff --git a/ccsdk-app-common/pom.xml b/ccsdk-app-common/pom.xml
index e9595d3..3266c22 100644
--- a/ccsdk-app-common/pom.xml
+++ b/ccsdk-app-common/pom.xml
@@ -29,6 +29,9 @@
 		<skipTests>false</skipTests>
 		<jacocoVersion>0.7.6.201602180812</jacocoVersion>
 		<jackson.version>2.9.8</jackson.version>
+		<sonar.coverage.jacoco.xmlReportPaths> 
+			${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml 
+    	</sonar.coverage.jacoco.xmlReportPaths>
 	</properties>
 
 	<repositories>
diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java
index ab9dd59..6b7af79 100644
--- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java
@@ -1103,8 +1103,9 @@ public class CloudifyRestClientImpl extends RestClientBase implements CloudifyCl
     public CloudifyPluginList getPlugins() throws Exception {
         String url = buildUrl(new String[] {baseUrl, PLUGINS}, null);
         logger.debug(EELFLoggerDelegate.debugLogger, "getPlugins: url {}", url);
+        HttpEntity<String> entity = getTenantHeader("default_tenant");
         ResponseEntity<CloudifyPluginList> response = restTemplate.exchange(url, HttpMethod.GET,
-            null, new ParameterizedTypeReference<CloudifyPluginList>() {});
+            entity, new ParameterizedTypeReference<CloudifyPluginList>() {});
         CloudifyPluginList result = response.getBody();
         return result;
     }
diff --git a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java
index a6f5038..c117f23 100644
--- a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java
+++ b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java
@@ -772,7 +772,7 @@ public class CloudifyRestClientImplTest extends MockitoTestSuite {
         ResponseEntity<CloudifyPluginList> response =
             new ResponseEntity<CloudifyPluginList>(cfyPluginList, HttpStatus.OK);
 
-        when(mockRest.exchange(anyString(), eq(HttpMethod.GET), isNull(),
+        when(mockRest.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class),
             eq(new ParameterizedTypeReference<CloudifyPluginList>() {}))).thenReturn(response);
 
         CloudifyPluginList actuals = subject.getPlugins();
-- 
cgit 1.2.3-korg