diff options
Diffstat (limited to 'datarouter-prov')
7 files changed, 42 insertions, 32 deletions
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml index 54f6d85b..223261c6 100755 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -141,11 +141,6 @@ <artifactId>httpclient</artifactId> </dependency> <dependency> - <groupId>org.dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>2.1.1</version> - </dependency> - <dependency> <groupId>org.sonatype.http-testing-harness</groupId> <artifactId>junit-runner</artifactId> <scope>test</scope> 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 @@ -#-------------------------------------------------------------------------------
+<!------------------------------------------------------------------------------
# ============LICENSE_START==================================================
# * org.onap.dmaap
# * ===========================================================================
@@ -19,10 +19,12 @@ # *
# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
# *
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------->
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
+ <title>DMaaP DR Authz Impl package</title>
</head>
<body>
<p>
@@ -55,8 +57,6 @@ class defined in this package, passing it an instance of the <code>ProvDataProvi implementation.
</li>
</ul>
-</p>
-<p>
Example:
<pre>
<code>
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 @@ -#-------------------------------------------------------------------------------
+<!-------------------------------------------------------------------------------
# ============LICENSE_START==================================================
# * org.onap.dmaap
# * ===========================================================================
@@ -19,10 +19,12 @@ # *
# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
# *
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------->
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
+ <title>DMaaP DR Authz package</title>
</head>
<body>
<p>
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 @@ -#-------------------------------------------------------------------------------
+<!-------------------------------------------------------------------------------
# ============LICENSE_START==================================================
# * org.onap.dmaap
# * ===========================================================================
@@ -19,13 +19,17 @@ # *
# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
# *
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------->
-<html>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>DMaaP DR Provisioning Beans</title>
+</head>
<body>
<p>
This package provides beans to represent the basic provisioning objects of the Data Router application.
-These objects are defined by the document <b>Data Router Release 1 Provisioning API</b> <i>Version 1.2</i>.
+These objects are defined by the document <strong>Data Router Release 1 Provisioning API</strong> <em>Version 1.2</em>.
</p>
</body>
</html>
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 @@ -#------------------------------------------------------------------------------- +<!------------------------------------------------------------------------------- # ============LICENSE_START================================================== # * org.onap.dmaap # * =========================================================================== @@ -19,22 +19,26 @@ # * # * ECOMP is a trademark and service mark of AT&T Intellectual Property. # * -#------------------------------------------------------------------------------- +#-------------------------------------------------------------------------------> -<html> +<!DOCTYPE html> +<html lang="en"> +<head> + <title>DMaaP DR Provisioning Servlets</title> +</head> <body> <p> This package provides the servlets used by the provisioning server for the Data Router application. -URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>. +URLs are from the document <strong>URLs for DR Release 1</strong> <em>Version 1.2</em>. </p> <div class="contentContainer"> -<table class="packageSummary" border="0" cellpadding="3" cellspacing="0"> +<table class="packageSummary" border="0"> <caption><span>URL Path Summary</span><span class="tabEnd"> </span></caption> <tr class="altColor"> - <th class="colFirst">URL Path</th> - <th class="colOne">Symbolic Name</th> - <th class="colLast">Servlet Name</th> - <th class="colLast" colspan="4">Allowed Methods</th> + <th class="colFirst" scope="col">URL Path</th> + <th class="colOne" scope="col">Symbolic Name</th> + <th class="colLast" scope="col">Servlet Name</th> + <th class="colLast" colspan="4" scope="col">Allowed Methods</th> </tr> <tr> <td class="colFirst" class="colOne">/</td> 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 @@ -#-------------------------------------------------------------------------------
+<!-------------------------------------------------------------------------------
# ============LICENSE_START==================================================
# * org.onap.dmaap
# * ===========================================================================
@@ -19,9 +19,13 @@ # *
# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
# *
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------->
-<html>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>DMaaP DR Provisioning Utils</title>
+</head>
<body>
<p>
This package provide various helper classes used by the provisioning server.
|