Apply formatting

This will make sure we have a consistent style across our project and the PRs are only concerned with actual changes and no longer about style.

src/main/java/org/owasp/webgoat/container/assignments/AssignmentEndpoint.java

@@ -35,57 +35,58 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 public abstract class AssignmentEndpoint implements Initializeable {
 
-    @Autowired
-    private WebSession webSession;
-    @Autowired
-    private UserSessionData userSessionData;
-    @Getter
-    @Autowired
-    private PluginMessages messages;
+  @Autowired private WebSession webSession;
+  @Autowired private UserSessionData userSessionData;
+  @Getter @Autowired private PluginMessages messages;
 
-    protected WebSession getWebSession() {
-        return webSession;
-    }
+  protected WebSession getWebSession() {
+    return webSession;
+  }
 
-    protected UserSessionData getUserSessionData() {
-        return userSessionData;
-    }
+  protected UserSessionData getUserSessionData() {
+    return userSessionData;
+  }
 
-    /**
-     * Convenience method for create a successful result:
-     * <p>
-     * - Assignment is set to solved
-     * - Feedback message is set to 'assignment.solved'
-     * <p>
-     * Of course you can overwrite these values in a specific lesson
-     *
-     * @return a builder for creating a result from a lesson
-     * @param assignment
-     */
-    protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
-        return AttackResult.builder(messages).lessonCompleted(true).attemptWasMade().feedback("assignment.solved").assignment(assignment);
-    }
+  /**
+   * Convenience method for create a successful result:
+   *
+   * <p>- Assignment is set to solved - Feedback message is set to 'assignment.solved'
+   *
+   * <p>Of course you can overwrite these values in a specific lesson
+   *
+   * @return a builder for creating a result from a lesson
+   * @param assignment
+   */
+  protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
+    return AttackResult.builder(messages)
+        .lessonCompleted(true)
+        .attemptWasMade()
+        .feedback("assignment.solved")
+        .assignment(assignment);
+  }
 
-    /**
-     * Convenience method for create a failed result:
-     * <p>
-     * - Assignment is set to not solved
-     * - Feedback message is set to 'assignment.not.solved'
-     * <p>
-     * Of course you can overwrite these values in a specific lesson
-     *
-     * @return a builder for creating a result from a lesson
-     * @param assignment
-     */
-    protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
-        return AttackResult.builder(messages).lessonCompleted(false).attemptWasMade().feedback("assignment.not.solved").assignment(assignment);
-    }
+  /**
+   * Convenience method for create a failed result:
+   *
+   * <p>- Assignment is set to not solved - Feedback message is set to 'assignment.not.solved'
+   *
+   * <p>Of course you can overwrite these values in a specific lesson
+   *
+   * @return a builder for creating a result from a lesson
+   * @param assignment
+   */
+  protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
+    return AttackResult.builder(messages)
+        .lessonCompleted(false)
+        .attemptWasMade()
+        .feedback("assignment.not.solved")
+        .assignment(assignment);
+  }
 
-    protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
-        return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
-    }
+  protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
+    return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
+  }
 
-    @Override
-    public void initialize(WebGoatUser user) {
-    }
+  @Override
+  public void initialize(WebGoatUser user) {}
 }

src/main/java/org/owasp/webgoat/container/assignments/AssignmentHints.java

@@ -5,12 +5,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Created by nbaars on 1/14/17.
- */
+/** Created by nbaars on 1/14/17. */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentHints {
 
-    String[] value() default {};
+  String[] value() default {};
 }

src/main/java/org/owasp/webgoat/container/assignments/AssignmentPath.java

@@ -1,22 +1,19 @@
 package org.owasp.webgoat.container.assignments;
 
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.springframework.web.bind.annotation.RequestMethod;
 
-/**
- * Created by nbaars on 1/14/17.
- */
+/** Created by nbaars on 1/14/17. */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentPath {
 
-    String[] path() default {};
+  String[] path() default {};
 
-    RequestMethod[] method() default {};
+  RequestMethod[] method() default {};
 
-    String value() default "";
+  String value() default "";
 }

src/main/java/org/owasp/webgoat/container/assignments/AttackResult.java

@@ -25,100 +25,104 @@
 
 package org.owasp.webgoat.container.assignments;
 
+import static org.apache.commons.text.StringEscapeUtils.escapeJson;
+
 import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
 
-import static org.apache.commons.text.StringEscapeUtils.escapeJson;
-
 public class AttackResult {
 
+  public static class AttackResultBuilder {
 
-    public static class AttackResultBuilder {
-
-        private boolean lessonCompleted;
-        private PluginMessages messages;
-        private Object[] feedbackArgs;
-        private String feedbackResourceBundleKey;
-        private String output;
-        private Object[] outputArgs;
-        private AssignmentEndpoint assignment;
-        private boolean attemptWasMade = false;
-
-        public AttackResultBuilder(PluginMessages messages) {
-            this.messages = messages;
-        }
-
-        public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
-            this.lessonCompleted = lessonCompleted;
-            this.feedbackResourceBundleKey = "lesson.completed";
-            return this;
-        }
-
-        public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
-            this.lessonCompleted = lessonCompleted;
-            this.feedbackResourceBundleKey = resourceBundleKey;
-            return this;
-        }
-
-        public AttackResultBuilder feedbackArgs(Object... args) {
-            this.feedbackArgs = args;
-            return this;
-        }
-
-        public AttackResultBuilder feedback(String resourceBundleKey) {
-            this.feedbackResourceBundleKey = resourceBundleKey;
-            return this;
-        }
-
-        public AttackResultBuilder output(String output) {
-            this.output = output;
-            return this;
-        }
-
-        public AttackResultBuilder outputArgs(Object... args) {
-            this.outputArgs = args;
-            return this;
-        }
-
-        public AttackResultBuilder attemptWasMade() {
-            this.attemptWasMade = true;
-            return this;
-        }
-
-        public AttackResult build() {
-            return new AttackResult(lessonCompleted, messages.getMessage(feedbackResourceBundleKey, feedbackArgs), messages.getMessage(output, output, outputArgs), assignment.getClass().getSimpleName(), attemptWasMade);
-        }
-
-        public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
-            this.assignment = assignment;
-            return this;
-        }
-    }
-
-    @Getter
     private boolean lessonCompleted;
-    @Getter
-    private String feedback;
-    @Getter
+    private PluginMessages messages;
+    private Object[] feedbackArgs;
+    private String feedbackResourceBundleKey;
     private String output;
-    @Getter
-    private final String assignment;
-    @Getter
-    private boolean attemptWasMade;
+    private Object[] outputArgs;
+    private AssignmentEndpoint assignment;
+    private boolean attemptWasMade = false;
 
-    public AttackResult(boolean lessonCompleted, String feedback, String output, String assignment, boolean attemptWasMade) {
-        this.lessonCompleted = lessonCompleted;
-        this.feedback = escapeJson(feedback);
-        this.output = escapeJson(output);
-        this.assignment = assignment;
-        this.attemptWasMade = attemptWasMade;
+    public AttackResultBuilder(PluginMessages messages) {
+      this.messages = messages;
     }
 
-    public static AttackResultBuilder builder(PluginMessages messages) {
-        return new AttackResultBuilder(messages);
+    public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
+      this.lessonCompleted = lessonCompleted;
+      this.feedbackResourceBundleKey = "lesson.completed";
+      return this;
     }
 
-    public boolean assignmentSolved() {
-        return lessonCompleted;
+    public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
+      this.lessonCompleted = lessonCompleted;
+      this.feedbackResourceBundleKey = resourceBundleKey;
+      return this;
     }
+
+    public AttackResultBuilder feedbackArgs(Object... args) {
+      this.feedbackArgs = args;
+      return this;
+    }
+
+    public AttackResultBuilder feedback(String resourceBundleKey) {
+      this.feedbackResourceBundleKey = resourceBundleKey;
+      return this;
+    }
+
+    public AttackResultBuilder output(String output) {
+      this.output = output;
+      return this;
+    }
+
+    public AttackResultBuilder outputArgs(Object... args) {
+      this.outputArgs = args;
+      return this;
+    }
+
+    public AttackResultBuilder attemptWasMade() {
+      this.attemptWasMade = true;
+      return this;
+    }
+
+    public AttackResult build() {
+      return new AttackResult(
+          lessonCompleted,
+          messages.getMessage(feedbackResourceBundleKey, feedbackArgs),
+          messages.getMessage(output, output, outputArgs),
+          assignment.getClass().getSimpleName(),
+          attemptWasMade);
+    }
+
+    public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
+      this.assignment = assignment;
+      return this;
+    }
+  }
+
+  @Getter private boolean lessonCompleted;
+  @Getter private String feedback;
+  @Getter private String output;
+  @Getter private final String assignment;
+  @Getter private boolean attemptWasMade;
+
+  public AttackResult(
+      boolean lessonCompleted,
+      String feedback,
+      String output,
+      String assignment,
+      boolean attemptWasMade) {
+    this.lessonCompleted = lessonCompleted;
+    this.feedback = escapeJson(feedback);
+    this.output = escapeJson(output);
+    this.assignment = assignment;
+    this.attemptWasMade = attemptWasMade;
+  }
+
+  public static AttackResultBuilder builder(PluginMessages messages) {
+    return new AttackResultBuilder(messages);
+  }
+
+  public boolean assignmentSolved() {
+    return lessonCompleted;
+  }
 }

src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java

@@ -36,39 +36,46 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 @RestControllerAdvice
 public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
 
-    private UserTrackerRepository userTrackerRepository;
-    private WebSession webSession;
+  private UserTrackerRepository userTrackerRepository;
+  private WebSession webSession;
 
-    public LessonTrackerInterceptor(UserTrackerRepository userTrackerRepository, WebSession webSession) {
-        this.userTrackerRepository = userTrackerRepository;
-        this.webSession = webSession;
+  public LessonTrackerInterceptor(
+      UserTrackerRepository userTrackerRepository, WebSession webSession) {
+    this.userTrackerRepository = userTrackerRepository;
+    this.webSession = webSession;
+  }
+
+  @Override
+  public boolean supports(
+      MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
+    return true;
+  }
+
+  @Override
+  public Object beforeBodyWrite(
+      Object o,
+      MethodParameter methodParameter,
+      MediaType mediaType,
+      Class<? extends HttpMessageConverter<?>> aClass,
+      ServerHttpRequest serverHttpRequest,
+      ServerHttpResponse serverHttpResponse) {
+    if (o instanceof AttackResult attackResult) {
+      trackProgress(attackResult);
     }
+    return o;
+  }
 
-    @Override
-    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
-        return true;
+  protected AttackResult trackProgress(AttackResult attackResult) {
+    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+    if (userTracker == null) {
+      userTracker = new UserTracker(webSession.getUserName());
     }
-
-    @Override
-    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-        if (o instanceof AttackResult attackResult) {
-            trackProgress(attackResult);
-        }
-        return o;
-    }
-
-
-    protected AttackResult trackProgress(AttackResult attackResult) {
-        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-        if (userTracker == null) {
-            userTracker = new UserTracker(webSession.getUserName());
-        }
-        if (attackResult.assignmentSolved()) {
-            userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
-        } else {
-            userTracker.assignmentFailed(webSession.getCurrentLesson());
-        }
-        userTrackerRepository.saveAndFlush(userTracker);
-        return attackResult;
+    if (attackResult.assignmentSolved()) {
+      userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
+    } else {
+      userTracker.assignmentFailed(webSession.getCurrentLesson());
     }
+    userTrackerRepository.saveAndFlush(userTracker);
+    return attackResult;
+  }
 }