瀏覽代碼

fix spotbugs error

Jason Rivard 5 年之前
父節點
當前提交
a8a0181292

+ 4 - 6
rest-test-service/src/main/java/password/pwm/resttest/RestTestRemoteResponsesServlet.java

@@ -32,6 +32,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 @WebServlet(
 @WebServlet(
@@ -66,11 +68,7 @@ public class RestTestRemoteResponsesServlet extends HttpServlet
         final ResponseData responseData = ResponseData.builder()
         final ResponseData responseData = ResponseData.builder()
             .displayInstructions( "remote responses test server instructions" )
             .displayInstructions( "remote responses test server instructions" )
             .verificationState( correct ? "COMPLETE" : "INPROGRESS" )
             .verificationState( correct ? "COMPLETE" : "INPROGRESS" )
-            .userPrompts( new Prompt[]
-                {
-                    new Prompt( "prompt1", "id1" ),
-                    }
-            )
+            .userPrompts( Collections.singletonList( new Prompt( "prompt1", "id1" ) ) )
             .errorMessage(  correct ? "" : "incorrect response for 'id1'.  ( correct response is 'answer1' ) " )
             .errorMessage(  correct ? "" : "incorrect response for 'id1'.  ( correct response is 'answer1' ) " )
             .build();
             .build();
 
 
@@ -93,7 +91,7 @@ public class RestTestRemoteResponsesServlet extends HttpServlet
     {
     {
         private final String displayInstructions;
         private final String displayInstructions;
         private final String verificationState;
         private final String verificationState;
-        private final Prompt[] userPrompts;
+        private final List<Prompt> userPrompts;
         private final String errorMessage;
         private final String errorMessage;
 
 
     }
     }

+ 4 - 0
server/src/main/java/password/pwm/http/bean/NewUserBean.java

@@ -22,6 +22,7 @@ package password.pwm.http.bean;
 
 
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 import password.pwm.VerificationMethodSystem;
 import password.pwm.VerificationMethodSystem;
 import password.pwm.config.option.SessionBeanMode;
 import password.pwm.config.option.SessionBeanMode;
@@ -37,8 +38,11 @@ import java.util.Set;
 
 
 @Data
 @Data
 @NoArgsConstructor
 @NoArgsConstructor
+@EqualsAndHashCode( callSuper = false )
 public class NewUserBean extends PwmSessionBean
 public class NewUserBean extends PwmSessionBean
 {
 {
+    private static final long serialVersionUID = 1L;
+
     @SerializedName( "p" )
     @SerializedName( "p" )
     private String profileID;
     private String profileID;