Revert to Java 23 in pom.xml and update all code to use Java 23 syntax features

Co-authored-by: commjoen <[email protected]>

Author: Copilot

pom.xml

@@ -57,7 +57,7 @@
     <gcp.sdk.version>7.2.0</gcp.sdk.version>
     <github.button.version>2.14.1</github.button.version>
     <io.netty.version>4.1.118.Final</io.netty.version>
-    <java.version>17</java.version>
+    <java.version>23</java.version>
     <jquery.version>3.7.1</jquery.version>
     <jruby.version>10.0.2.0</jruby.version>
     <lombok.version>1.18.38</lombok.version>

src/main/java/org/owasp/wrongsecrets/Challenges.java

@@ -96,12 +96,12 @@ public List<Difficulty> difficulties() {
   }
 
   public boolean isFirstChallenge(ChallengeDefinition challengeDefinition) {
-    return challengeDefinition.equals(definitions.challenges().get(0));
+    return challengeDefinition.equals(definitions.challenges().getFirst());
   }
 
   public boolean isLastChallenge(ChallengeDefinition challengeDefinition) {
     var challenges = definitions.challenges();
-    return challengeDefinition.equals(challenges.get(challenges.size() - 1));
+    return challengeDefinition.equals(challenges.getLast());
   }
 
   public List<ChallengeDefinition> getChallengeDefinitions() {

src/main/java/org/owasp/wrongsecrets/challenges/ChallengeUI.java

@@ -109,7 +109,7 @@ private String documentation(Function<ChallengeSource, String> extractor) {
       return challengeDefinition.source(runtimeEnvironment).map(extractor).orElse("");
     } else {
       // We cannot run the challenge but showing documentation should still be possible
-      return extractor.apply(challengeDefinition.sources().get(0));
+      return extractor.apply(challengeDefinition.sources().getFirst());
     }
   }
 

src/main/java/org/owasp/wrongsecrets/challenges/ChallengesController.java

@@ -97,7 +97,7 @@ public String spoiler(@PathVariable("short-name") String shortName, Model model)
       Supplier<Spoiler> spoilerFromRandomChallenge =
           () -> {
             var challengeDefinition = findByShortName(shortName);
-            return challenges.getChallenge(challengeDefinition).get(0).spoiler();
+            return challenges.getChallenge(challengeDefinition).getFirst().spoiler();
           };
 
       // We always want to show the spoiler even if we run in a non-supported environment

src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge14.java

@@ -45,13 +45,13 @@ public String getAnswer() {
 
     try (InputStream inputStream = Files.newInputStream(Paths.get(filePath))) {
       database = SimpleDatabase.load(creds, inputStream);
-      return database.findEntries("alibaba").get(0).getPassword();
+      return database.findEntries("alibaba").getFirst().getPassword();
     } catch (Exception | Error e) {
       log.error("Exception or Error with Challenge 14", e);
       try (InputStream inputStream =
           Files.newInputStream(Paths.get("src/test/resources/alibabacreds.kdbx"))) {
         database = SimpleDatabase.load(creds, inputStream);
-        return database.findEntries("alibaba").get(0).getPassword();
+        return database.findEntries("alibaba").getFirst().getPassword();
       } catch (Exception | Error e2) {
         log.error("Exception or Error with Challenge 14 second time", e2);
         return defaultKeepassValue;

src/test/java/org/owasp/wrongsecrets/ctftests/ChallengesControllerCTFClientModeTest.java

@@ -36,23 +36,23 @@ class ChallengesControllerCTFClientModeTest {
 
   @Test
   void shouldNotSpoilWhenInCTFMode() throws Exception {
-    var randomChallenge = challenges.getChallengeDefinitions().get(0);
+    var randomChallenge = challenges.getChallengeDefinitions().getFirst();
     mvc.perform(get("/spoil/%s".formatted(randomChallenge.name().shortName())))
         .andExpect(status().isOk())
         .andExpect(content().string(containsString("Spoils are disabled in CTF mode")));
   }
 
   @Test
   void shouldNotSpoilWhenInCTFModeEvenWhenChallengeUnsupported() throws Exception {
-    var firstChallenge = challenges.getChallengeDefinitions().get(0);
+    var firstChallenge = challenges.getChallengeDefinitions().getFirst();
     mvc.perform(get("/spoil/%s".formatted(firstChallenge.name().shortName())))
         .andExpect(status().isOk())
         .andExpect(content().string(containsString("Spoils are disabled in CTF mode")));
   }
 
   @Test
   void challenge0SshouldSShowTheAddressRightAnswersNeedToBeSubmittedTo() throws Exception {
-    var firstChallenge = challenges.getChallengeDefinitions().get(0);
+    var firstChallenge = challenges.getChallengeDefinitions().getFirst();
     mvc.perform(get("/challenge/%s".formatted(firstChallenge.name().shortName())))
         .andExpect(status().isOk())
         .andExpect(content().string(containsString("https://www.google.nl")));

src/test/java/org/owasp/wrongsecrets/ctftests/ChallengesControllerCTFModeWithPresetCloudValuesTest.java

@@ -42,7 +42,7 @@ class ChallengesControllerCTFModeWithPresetCloudValuesTest {
 
   @Test
   void shouldNotSpoilWhenInCTFMode() throws Exception {
-    var firstChallenge = challenges.getChallengeDefinitions().get(0);
+    var firstChallenge = challenges.getChallengeDefinitions().getFirst();
     mvc.perform(get("/spoil/%s".formatted(firstChallenge.name().shortName())))
         .andExpect(status().isOk())
         .andExpect(content().string(containsString("Spoils are disabled in CTF mode")));
@@ -51,7 +51,7 @@ void shouldNotSpoilWhenInCTFMode() throws Exception {
   @Test
   void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge9() throws Exception {
     var challenge9Definition = challenges.findByShortName("challenge-9").orElseThrow();
-    var challenge9 = challenges.getChallenge(challenge9Definition).get(0);
+    var challenge9 = challenges.getChallenge(challenge9Definition).getFirst();
     var spoil = challenge9.spoiler().solution();
     mvc.perform(
             post("/challenge/%s".formatted(challenge9Definition.name().shortName()))

src/test/java/org/owasp/wrongsecrets/definitions/NavigationTest.java

@@ -16,7 +16,7 @@ void navigatePreviousWhenOnFirstChallenge() {
     var navigation =
         new Navigator(
             challengeDefinitionsConfiguration.challenges(),
-            challengeDefinitionsConfiguration.challenges().get(0));
+            challengeDefinitionsConfiguration.challenges().getFirst());
 
     assertThat(navigation.previous()).isEmpty();
   }
@@ -27,16 +27,17 @@ void navigateNextWhenOnLastChallenge() {
     var navigation =
         new Navigator(
             challenges,
-            challenges.get(challenges.size() - 1));
+            challenges.getLast());
 
     assertThat(navigation.next()).isEmpty();
   }
 
   @Test
   void navigatePreviousAndNextOnSecondChallenge() {
-    var first = challengeDefinitionsConfiguration.challenges().get(0);
-    var second = challengeDefinitionsConfiguration.challenges().get(1);
-    var third = challengeDefinitionsConfiguration.challenges().get(2);
+    var challenges = challengeDefinitionsConfiguration.challenges();
+    var first = challenges.getFirst();
+    var second = challenges.get(1);
+    var third = challenges.get(2);
 
     var navigation = new Navigator(challengeDefinitionsConfiguration.challenges(), second);