create lib-data and lib-util submodules and begin move of appropriate code to submodules

Author: jrivard

data-service/pom.xml

@@ -144,6 +144,18 @@
     </reporting>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pwm-lib-data</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pwm-lib-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pwm-server</artifactId>
@@ -152,6 +164,7 @@
         </dependency>
 
 
+
         <!-- container dependencies -->
         <dependency>
             <groupId>javax.servlet</groupId>

data-service/src/main/java/password/pwm/receiver/CsvDownloadServlet.java

@@ -23,7 +23,7 @@
 import javax.servlet.annotation.WebServlet;
 
 @WebServlet(
-        name = "TelemetryViewer",
+        name = "CsvDownloadServlet",
         urlPatterns = {
                 "/csv",
         }

data-service/src/main/java/password/pwm/receiver/Logger.java

@@ -21,28 +21,33 @@
 package password.pwm.receiver;
 
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 
 public class Logger
 {
     private final String name;
 
-    private Logger( final Class classname )
+    private Logger( final Class<?> classname )
     {
         this.name = classname.getName();
     }
 
-    public static Logger createLogger( final Class classname )
+    public static Logger createLogger( final Class<?> classname )
     {
         return new Logger( classname );
     }
 
     public void info( final CharSequence input )
     {
-        System.out.println( "PwmReceiver: " + Instant.now().toString() + ", INFO , " + name + ", " + input );
+        System.out.println( "PwmReceiver: "
+                + Instant.now().truncatedTo( ChronoUnit.SECONDS ).toString()
+                + ", INFO , " + name + ", " + input );
     }
 
     public void debug( final CharSequence input )
     {
-        System.out.println( "PwmReceiver: " + Instant.now().toString() + ", DEBUG, " + name + ", " + input );
+        System.out.println( "PwmReceiver: "
+                + Instant.now().toString()
+                + ", DEBUG, " + name + ", " + input );
     }
 }

data-service/src/main/java/password/pwm/receiver/PwmReceiverConstants.java

@@ -0,0 +1,25 @@
+/*
+ * Password Management Servlets (PWM)
+ * http://www.pwm-project.org
+ *
+ * Copyright (c) 2006-2009 Novell, Inc.
+ * Copyright (c) 2009-2021 The PWM Project
+ *
+ * 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
+ *
+ * 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.
+ */
+
+package password.pwm.receiver;
+
+public class PwmReceiverConstants
+{
+}

data-service/src/main/java/password/pwm/receiver/Status.java

@@ -20,13 +20,11 @@
 
 package password.pwm.receiver;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 import java.time.Instant;
 
-@Getter
-@Setter
+@Data
 public class Status
 {
     private String errorState;

data-service/src/main/java/password/pwm/receiver/SummaryBean.java

@@ -29,6 +29,7 @@
 import password.pwm.util.java.TimeDuration;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
@@ -48,7 +49,7 @@ public class SummaryBean
     private Map<String, Integer> javaCount;
     private Map<String, Integer> appVersionCount;
 
-    static SummaryBean fromStorage( final Storage storage, final TimeDuration maxAge )
+    static SummaryBean fromStorage( final Storage storage, final Duration maxAge )
     {
 
         final String naText = "n/a";
@@ -67,9 +68,9 @@ static SummaryBean fromStorage( final Storage storage, final TimeDuration maxAge
         for ( Iterator<TelemetryPublishBean> iterator = storage.iterator(); iterator.hasNext(); )
         {
             final TelemetryPublishBean bean = iterator.next();
-            final TimeDuration age = TimeDuration.fromCurrent( bean.getTimestamp() );
+            final Duration age = Duration.between( Instant.now(), bean.getTimestamp() );
 
-            if ( bean.getAbout() != null && age.isShorterThan( maxAge ) )
+            if ( bean.getAbout() != null && age.toMillis() < maxAge.toMillis() )
             {
                 serverCount++;
                 final String hashID = bean.getInstanceHash();

data-service/src/main/java/password/pwm/receiver/TelemetryViewerServlet.java

@@ -21,14 +21,15 @@
 package password.pwm.receiver;
 
 import password.pwm.util.java.StringUtil;
-import password.pwm.util.java.TimeDuration;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 
 @WebServlet(
         name = "TelemetryViewer",
@@ -44,7 +45,8 @@ public class TelemetryViewerServlet extends HttpServlet
     public static final String SUMMARY_ATTR = "SummaryBean";
 
     @Override
-    protected void doGet( final HttpServletRequest req, final HttpServletResponse resp ) throws ServletException, IOException
+    protected void doGet( final HttpServletRequest req, final HttpServletResponse resp )
+            throws ServletException, IOException
     {
         LOGGER.debug( "http request for viewer" );
         final String daysString = req.getParameter( PARAM_DAYS );
@@ -64,7 +66,7 @@ protected void doGet( final HttpServletRequest req, final HttpServletResponse re
         }
 
         final Storage storage = app.getStorage();
-        final SummaryBean summaryBean = SummaryBean.fromStorage( storage, TimeDuration.of( days, TimeDuration.Unit.DAYS ) );
+        final SummaryBean summaryBean = SummaryBean.fromStorage( storage, Duration.of( days, ChronoUnit.DAYS ) );
         req.setAttribute( SUMMARY_ATTR, summaryBean );
         req.getServletContext().getRequestDispatcher( "/WEB-INF/jsp/telemetry-viewer.jsp" ).forward( req, resp );
     }

data-service/src/main/java/password/pwm/receiver/TestServlet.java

@@ -0,0 +1,39 @@
+/*
+ * Password Management Servlets (PWM)
+ * http://www.pwm-project.org
+ *
+ * Copyright (c) 2006-2009 Novell, Inc.
+ * Copyright (c) 2009-2021 The PWM Project
+ *
+ * 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
+ *
+ * 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.
+ */
+
+package password.pwm.receiver;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet( urlPatterns = "/testServlet" )
+public class TestServlet extends HttpServlet
+{
+    @Override
+    protected void doGet( final HttpServletRequest req, final HttpServletResponse resp )
+            throws ServletException, IOException
+    {
+        resp.getWriter().write( "yeppers" );
+    }
+}

data-service/src/main/webapp/WEB-INF/jsp/telemetry-viewer.jsp

@@ -34,6 +34,7 @@
 <html>
 <head>
     <title>Telemetry Data</title>
+    <link href="data-service-style.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <div>
@@ -62,7 +63,7 @@
     </form>
 
     <h2>Versions</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>Version</b></td>
             <td><b>Count</b></td>
@@ -75,7 +76,7 @@
         <% } %>
     </table>
     <h2>LDAP Vendors</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>Ldap</b></td>
             <td><b>Count</b></td>
@@ -88,7 +89,7 @@
         <% } %>
     </table>
     <h2>App Servers</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>App Server Info</b></td>
             <td><b>Count</b></td>
@@ -101,7 +102,7 @@
         <% } %>
     </table>
     <h2>OS Vendors</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>OS Vendor</b></td>
             <td><b>Count</b></td>
@@ -114,7 +115,7 @@
         <% } %>
     </table>
     <h2>DB Vendors</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>DB Vendor</b></td>
             <td><b>Count</b></td>
@@ -127,7 +128,7 @@
         <% } %>
     </table>
     <h2>Java VMs</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>Java VM</b></td>
             <td><b>Count</b></td>
@@ -140,7 +141,7 @@
         <% } %>
     </table>
     <h2>Settings</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>Setting</b></td>
             <td><b>Count</b></td>
@@ -153,7 +154,7 @@
         <% } %>
     </table>
     <h2>Statistics</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>Statistic</b></td>
             <td><b>Count</b></td>
@@ -166,8 +167,9 @@
         <% } %>
     </table>
     <br/>
+    <%--
     <h2>Summary Data</h2>
-    <table border="1">
+    <table>
         <tr>
             <td><b>SiteHash</b></td>
             <td><b>Description</b></td>
@@ -198,6 +200,7 @@
         </tr>
         <% } %>
     </table>
+    --%>
 </div>
 </body>
 </html>

data-service/src/main/webapp/data-service-style.css

@@ -0,0 +1,31 @@
+/*!
+ * Password Management Servlets (PWM)
+ * http://www.pwm-project.org
+ *
+ * Copyright (c) 2006-2009 Novell, Inc.
+ * Copyright (c) 2009-2021 The PWM Project
+ *
+ * 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
+ *
+ * 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.
+ */
+
+@import url("https://cdn.jsdelivr.net/npm/@xz/fonts@1/serve/source-code-pro.min.css");
+
+body {
+  font-family: 'Source Code Pro', sans-serif;
+}
+
+table, td, th {
+  border: 1px solid;
+  border-collapse: collapse;
+}
+