From 5906de2465975e42e4983abe411f30fa16050fdf Mon Sep 17 00:00:00 2001 From: efiacor Date: Thu, 16 Apr 2020 14:59:07 +0100 Subject: Fix sonar issues and reporting Signed-off-by: efiacor Change-Id: I29aa54e62d2dfaa6eddb16eb67c325254dfc0e06 Issue-ID: DMAAP-1426 --- .../onap/dmaap/datarouter/authz/impl/package.html | 10 +++++----- .../org/onap/dmaap/datarouter/authz/package.html | 8 +++++--- .../datarouter/provisioning/StatisticsServlet.java | 7 ++++--- .../datarouter/provisioning/beans/package.html | 12 ++++++++---- .../dmaap/datarouter/provisioning/package.html | 22 +++++++++++++--------- .../datarouter/provisioning/utils/package.html | 10 +++++++--- 6 files changed, 42 insertions(+), 27 deletions(-) (limited to 'datarouter-prov/src') diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html index 0d051db3..58055eaa 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html @@ -1,4 +1,4 @@ -#------------------------------------------------------------------------------- + - + + + DMaaP DR Authz Impl package

@@ -55,8 +57,6 @@ class defined in this package, passing it an instance of the ProvDataProvi implementation. -

-

Example: 

 
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/package.html
index 3b484500..be7e333e 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/package.html
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/package.html
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------------
+
 
-
+
+
 
+  DMaaP DR Authz package
 
 
 

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
index 76991ca0..c564db86 100755
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
@@ -32,6 +32,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -511,10 +513,9 @@ public class StatisticsServlet extends BaseServlet {
                 ResultSet rs = ps.executeQuery()) {
                 if ("csv".equals(outputType)) {
                     resp.setContentType("application/octet-stream");
-                    Date date = new Date();
-                    SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss");
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm:ss");
                     resp.setHeader("Content-Disposition",
-                        "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\"");
+                        "attachment; filename=\"result:" + LocalDateTime.now().format(formatter) + ".csv\"");
                     eventlogger.info("Generating CSV file from Statistics resultset");
                     rsToCSV(rs, out);
                 } else {
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/package.html
index c33902cd..f05b765b 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/package.html
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/package.html
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------------
+
 
-
+
+
+
+  DMaaP DR Provisioning Beans
+
 
 

 This package provides beans to represent the basic provisioning objects of the Data Router application.
-These objects are defined by the document Data Router Release 1 Provisioning API Version 1.2.
+These objects are defined by the document Data Router Release 1 Provisioning API Version 1.2.
 

 
 
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html
index af08391a..c6263e15 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------------
+
 
-
+
+
+
+    DMaaP DR Provisioning Servlets
+
 
 

 This package provides the servlets used by the provisioning server for the Data Router application.
-URLs are from the document URLs for DR Release 1 Version 1.2.
+URLs are from the document URLs for DR Release 1 Version 1.2.
 

 

-
+

-    
-    
-    
-    
+    
+    
+    
+    
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/package.html
index 09517fea..a110f130 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/package.html
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/package.html
@@ -1,4 +1,4 @@
-#-------------------------------------------------------------------------------
+
 
-
+
+
+
+  DMaaP DR Provisioning Utils
+

 This package provide various helper classes used by the provisioning server.
-- 
cgit 1.2.3-korg



 URL Path Summary 
 
URL PathSymbolic NameServlet NameAllowed MethodsURL PathSymbolic NameServlet NameAllowed Methods
 

 

     /