浏览代码

fix spotbugs errors in rest-test-servlet

jrivard@gmail.com 6 年之前
父节点
当前提交
1680a55334

+ 2 - 2
rest-test-service/src/main/java/password/pwm/resttest/ExternalMacroServlet.java

@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
-import java.util.Date;
+import java.time.Instant;
 
 @WebServlet(
         name = "NewUserServlet",
@@ -59,7 +59,7 @@ public class ExternalMacroServlet extends HttpServlet
             final String[] messageContent = body.split( "=" );
             final String message = messageContent[messageContent.length - 1];
             final String username = message.split( "\\+" )[0];
-            final Date currentDate = new Date();
+            final Instant currentDate = Instant.now();
             final SmsPostResponseBody messageBody = new SmsPostResponseBody( message, currentDate );
 
             instance.addToMap( username, messageBody );

+ 7 - 7
rest-test-service/src/main/java/password/pwm/resttest/SmsPostResponseBody.java

@@ -22,14 +22,14 @@
 
 package password.pwm.resttest;
 
-import java.util.Date;
+import java.time.Instant;
 
 public class SmsPostResponseBody
 {
-    private static String messageContent;
-    private static Date date;
+    private String messageContent;
+    private Instant date;
 
-    public SmsPostResponseBody( final String message, final Date date )
+    public SmsPostResponseBody( final String message, final Instant date )
     {
         final String[] strings = message.split( "&" );
         this.messageContent = strings[strings.length - 1];
@@ -42,7 +42,7 @@ public class SmsPostResponseBody
         this.messageContent = strings[strings.length - 1];
     }
 
-    public SmsPostResponseBody( final Date date )
+    public SmsPostResponseBody( final Instant date )
     {
         this.date = date;
         this.messageContent = "";
@@ -63,12 +63,12 @@ public class SmsPostResponseBody
         this.messageContent = messageContent;
     }
 
-    public Date getDate()
+    public Instant getDate()
     {
         return date;
     }
 
-    public void setDate( final Date date )
+    public void setDate( final Instant date )
     {
         this.date = date;
     }

+ 1 - 1
rest-test-service/src/main/java/password/pwm/resttest/SmsResponse.java

@@ -77,7 +77,7 @@ public class SmsResponse
             int mostRecentIndex = 0;
             for ( int i = 0; i < userMessages.size(); i++ )
             {
-                if ( userMessages.get( i ).getDate().getTime() > userMessages.get( mostRecentIndex ).getDate().getTime() )
+                if ( userMessages.get( i ).getDate().toEpochMilli() > userMessages.get( mostRecentIndex ).getDate().toEpochMilli() )
                 {
                     mostRecentIndex = i;
                 }