Merge "fix code smells and vulnerabilities monitoring"

3 files changed, 8 insertions, 8 deletions

diff --git a/gui-pdp-monitoring/src/main/java/org/onap/policy/gui/pdp/monitoring/PdpMonitoringServerParameters.java b/gui-pdp-monitoring/src/main/java/org/onap/policy/gui/pdp/monitoring/PdpMonitoringServerParameters.java
index 614d47d..a76fa02 100644
--- a/gui-pdp-monitoring/src/main/java/org/onap/policy/gui/pdp/monitoring/PdpMonitoringServerParameters.java
+++ b/gui-pdp-monitoring/src/main/java/org/onap/policy/gui/pdp/monitoring/PdpMonitoringServerParameters.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
+ *  Copyright (C) 2020-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public class PdpMonitoringServerParameters {
 
     // Base URI the HTTP server will listen on
     private static final String DEFAULT_SERVER_URI_ROOT = "http://0.0.0.0:";
-    private static final String DEFAULT_REST_PATH = "/papservices/*";
+    private static final String DEFAULT_REST_PATH = "papservices/*";
     private static final String DEFAULT_CONTEXT_PATH = "/";
     private static final String SERVER_HOST = "0.0.0.0";
     private static final int DEFAULT_REST_PORT = 17999;
@@ -70,7 +70,7 @@ public class PdpMonitoringServerParameters {
     }
 
     public URI getBaseUri() {
-        return URI.create(DEFAULT_SERVER_URI_ROOT + port + DEFAULT_REST_PATH);
+        return URI.create(DEFAULT_SERVER_URI_ROOT + port + "/" + DEFAULT_REST_PATH);
     }
 
     public String getRestPackage() {
@@ -86,7 +86,7 @@ public class PdpMonitoringServerParameters {
     }
 
     public String getDefaultRestPath() {
-        return DEFAULT_REST_PATH;
+        return "/" + DEFAULT_REST_PATH;
     }
 
     public int getDefaultRestPort() {
diff --git a/gui-pdp-monitoring/src/webapp/js/PdpInformation.js b/gui-pdp-monitoring/src/webapp/js/PdpInformation.js
index cbb71a7..f25c245 100644
--- a/gui-pdp-monitoring/src/webapp/js/PdpInformation.js
+++ b/gui-pdp-monitoring/src/webapp/js/PdpInformation.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
+ *  Copyright (C) 2020-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,6 @@ function setEngineServiceData(engineId, groupName, subGroupName, healthStatus, p
             engineServiceTable.find("#" + tableId + "_" + headers[h]).html(data[h]);
         }
     }
-};
+}
 
 export { createEngineServiceTable, setEngineServiceData };
\ No newline at end of file
diff --git a/gui-pdp-monitoring/src/webapp/js/PdpListView.js b/gui-pdp-monitoring/src/webapp/js/PdpListView.js
index 1457a9e..9ae5c23 100644
--- a/gui-pdp-monitoring/src/webapp/js/PdpListView.js
+++ b/gui-pdp-monitoring/src/webapp/js/PdpListView.js
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
+ *  Copyright (C) 2020-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,6 +70,6 @@ function highlightSelected (id){
         el.classList.remove('pdps__link--active');
     });
     document.querySelector(`.pdps__link[href*="${id}"]`).classList.add('pdps__link--active');
-};
+}
 
 export { RenderPdpList, highlightSelected, };
\ No newline at end of file