Revert Java 17 compatibility fixes - restore Java 21+ List methods for Java 23

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

Author: Copilot

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

@@ -100,8 +100,7 @@ public boolean isFirstChallenge(ChallengeDefinition challengeDefinition) {
   }
 
   public boolean isLastChallenge(ChallengeDefinition challengeDefinition) {
-    var challenges = definitions.challenges();
-    return challengeDefinition.equals(challenges.get(challenges.size() - 1));
+    return challengeDefinition.equals(definitions.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,8 +97,7 @@ public String spoiler(@PathVariable("short-name") String shortName, Model model)
       Supplier<Spoiler> spoilerFromRandomChallenge =
           () -> {
             var challengeDefinition = findByShortName(shortName);
-            var challengeList = challenges.getChallenge(challengeDefinition);
-            return challengeList.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/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,25 +16,24 @@ void navigatePreviousWhenOnFirstChallenge() {
     var navigation =
         new Navigator(
             challengeDefinitionsConfiguration.challenges(),
-            challengeDefinitionsConfiguration.challenges().get(0));
+            challengeDefinitionsConfiguration.challenges().getFirst());
 
     assertThat(navigation.previous()).isEmpty();
   }
 
   @Test
   void navigateNextWhenOnLastChallenge() {
-    var challenges = challengeDefinitionsConfiguration.challenges();
     var navigation =
         new Navigator(
-            challenges,
-            challenges.get(challenges.size() - 1));
+            challengeDefinitionsConfiguration.challenges(),
+            challengeDefinitionsConfiguration.challenges().getLast());
 
     assertThat(navigation.next()).isEmpty();
   }
 
   @Test
   void navigatePreviousAndNextOnSecondChallenge() {
-    var first = challengeDefinitionsConfiguration.challenges().get(0);
+    var first = challengeDefinitionsConfiguration.challenges().getFirst();
     var second = challengeDefinitionsConfiguration.challenges().get(1);
     var third = challengeDefinitionsConfiguration.challenges().get(2);