Code style (#696)

* Remove Guava dependency from WebGoat

* Add Checkstyle to the project with very basic standards so we have a
style across lessons. It does not interfere with basic Intellij formatting

webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/challenges/Flag.java

@@ -22,7 +22,6 @@
 
 package org.owasp.webgoat.challenges;
 
-import com.google.common.collect.Maps;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +39,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.PostConstruct;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.IntStream;
@@ -52,7 +52,7 @@ import java.util.stream.IntStream;
 @RestController
 public class Flag {
 
-    public static final Map<Integer, String> FLAGS = Maps.newHashMap();
+    public static final Map<Integer, String> FLAGS = new HashMap<>();
     @Autowired
     private UserTrackerRepository userTrackerRepository;
     @Autowired
@@ -71,7 +71,7 @@ public class Flag {
         IntStream.range(1, 10).forEach(i -> FLAGS.put(i, UUID.randomUUID().toString()));
     }
 
-    @RequestMapping(path="/challenge/flag", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(path = "/challenge/flag", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public AttackResult postFlag(@RequestParam String flag) {
         UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());

webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/challenges/challenge7/Assignment7.java

@@ -31,14 +31,14 @@ import static org.owasp.webgoat.challenges.Flag.FLAGS;
 @Slf4j
 public class Assignment7 extends AssignmentEndpoint {
 
-    private static final String TEMPLATE = "Hi, you requested a password reset link, please use this " +
-            "<a target='_blank' href='%s:8080/WebGoat/challenge/7/reset-password/%s'>link</a> to reset your password." +
-            "\n \n\n" +
-            "If you did not request this password change you can ignore this message." +
-            "\n" +
-            "If you have any comments or questions, please do not hesitate to reach us at support@webgoat-cloud.org" +
-            "\n\n" +
-            "Kind regards, \nTeam WebGoat";
+    private static final String TEMPLATE = "Hi, you requested a password reset link, please use this "
+            + "<a target='_blank' href='%s:8080/WebGoat/challenge/7/reset-password/%s'>link</a> to reset your password."
+            + "\n \n\n"
+            + "If you did not request this password change you can ignore this message."
+            + "\n"
+            + "If you have any comments or questions, please do not hesitate to reach us at support@webgoat-cloud.org"
+            + "\n\n"
+            + "Kind regards, \nTeam WebGoat";
 
     @Autowired
     private RestTemplate restTemplate;
@@ -48,9 +48,9 @@ public class Assignment7 extends AssignmentEndpoint {
     @GetMapping("/challenge/7/reset-password/{link}")
     public ResponseEntity<String> resetPassword(@PathVariable(value = "link") String link) {
         if (link.equals(SolutionConstants.ADMIN_PASSWORD_LINK)) {
-            return ResponseEntity.accepted().body("<h1>Success!!</h1>" +
-                    "<img src='/WebGoat/images/hi-five-cat.jpg'>" +
-                    "<br/><br/>Here is your flag: " + "<b>" + FLAGS.get(7) + "</b>");
+            return ResponseEntity.accepted().body("<h1>Success!!</h1>"
+                    + "<img src='/WebGoat/images/hi-five-cat.jpg'>"
+                    + "<br/><br/>Here is your flag: " + "<b>" + FLAGS.get(7) + "</b>");
         }
         return ResponseEntity.status(HttpStatus.I_AM_A_TEAPOT).body("That is not the reset link for admin");
     }
@@ -76,7 +76,6 @@ public class Assignment7 extends AssignmentEndpoint {
 
     @GetMapping(value = "/challenge/7/.git", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     @ResponseBody
-    @SneakyThrows
     public ClassPathResource git() {
         return new ClassPathResource("challenge7/git.zip");
     }

webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/challenges/challenge7/PasswordResetLink.java

@@ -20,7 +20,7 @@ public class PasswordResetLink {
     }
 
     public static String scramble(Random random, String inputString) {
-        char a[] = inputString.toCharArray();
+        char[] a = inputString.toCharArray();
         for (int i = 0; i < a.length; i++) {
             int j = random.nextInt(a.length);
             char temp = a[i];

webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/challenges/challenge8/Assignment8.java

@@ -1,6 +1,5 @@
 package org.owasp.webgoat.challenges.challenge8;
 
-import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.challenges.Flag;
@@ -24,7 +23,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class Assignment8 extends AssignmentEndpoint {
 
-    private static final Map<Integer, Integer> votes = Maps.newHashMap();
+    private static final Map<Integer, Integer> votes = new HashMap<>();
 
     static {
         votes.put(1, 400);
@@ -40,9 +39,7 @@ public class Assignment8 extends AssignmentEndpoint {
         //Simple implementation of VERB Based Authentication
         String msg = "";
         if (request.getMethod().equals("GET")) {
-            HashMap<String, Object> json = Maps.newHashMap();
-            json.put("error", true);
-            json.put("message", "Sorry but you need to login first in order to vote");
+            var json = Map.of("error", true, "message", "Sorry but you need to login first in order to vote");
             return ResponseEntity.status(200).body(json);
         }
         Integer allVotesForStar = votes.getOrDefault(nrOfStars, 0);
@@ -59,8 +56,7 @@ public class Assignment8 extends AssignmentEndpoint {
     public ResponseEntity<Map<String, Integer>> average() {
         int totalNumberOfVotes = votes.values().stream().mapToInt(i -> i.intValue()).sum();
         int categories = votes.entrySet().stream().mapToInt(e -> e.getKey() * e.getValue()).reduce(0, (a, b) -> a + b);
-        Map json = Maps.newHashMap();
-        json.put("average", (int) Math.ceil((double) categories / totalNumberOfVotes));
+        var json = Map.of("average", (int) Math.ceil((double) categories / totalNumberOfVotes));
         return ResponseEntity.ok(json);
     }
 }