Fix TUs, Upgrade JDK 21

Author: Thierry Boileau

.tool-versions

@@ -1,2 +1,2 @@
-java adoptopenjdk-17.0.8+101
+java adoptopenjdk-21.0.2+13.0.LTS
 maven 3.8.8

org.restlet/pom.xml

@@ -100,6 +100,9 @@
             <testResource>
                 <directory>src/test/resources</directory>
                 <filtering>true</filtering>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
             </testResource>
         </testResources>
         <plugins>

org.restlet/src/main/java/org/restlet/Application.java

@@ -59,7 +59,7 @@
  * @author Jerome Louvel
  */
 public class Application extends Restlet {
-	private static final ThreadLocal<Application> CURRENT = new ThreadLocal<Application>();
+	private static final ThreadLocal<Application> CURRENT = new ThreadLocal<>();
 
 	/**
 	 * This variable is stored internally as a thread local variable and updated

org.restlet/src/main/java/org/restlet/Client.java

@@ -129,13 +129,10 @@ public void handle(Request request, Response response) {
         if (getHelper() != null) {
             getHelper().handle(request, response);
         } else {
-            StringBuilder sb = new StringBuilder();
-            sb.append(
-                    "No available client connector supports the required protocol: ");
-            sb.append("'").append(request.getProtocol().getName()).append("'.");
-            sb.append(
-                    " Please add the JAR of a matching connector to your classpath.");
-            response.setStatus(Status.CONNECTOR_ERROR_INTERNAL, sb.toString());
+            String sb = "No available client connector supports the required protocol: " +
+                    "'" + request.getProtocol().getName() + "'." +
+                    " Please add the JAR of a matching connector to your classpath.";
+            response.setStatus(Status.CONNECTOR_ERROR_INTERNAL, sb);
         }
     }
 

org.restlet/src/main/java/org/restlet/Restlet.java

@@ -39,8 +39,7 @@ public abstract class Restlet implements Uniform {
 	 */
 	private static void fireContextChanged(Restlet restlet, Context context) {
 		if (context != null) {
-			if (context instanceof org.restlet.engine.util.ChildContext) {
-				org.restlet.engine.util.ChildContext childContext = (org.restlet.engine.util.ChildContext) context;
+			if (context instanceof org.restlet.engine.util.ChildContext childContext) {
 
 				if (childContext.getChild() == null) {
 					childContext.setChild(restlet);

org.restlet/src/main/java/org/restlet/data/ChallengeRequest.java

@@ -65,19 +65,18 @@ public boolean equals(final Object obj) {
 		if (obj == this) {
 			return true;
 		}
-		if (!(obj instanceof ChallengeRequest)) {
+		if (!(obj instanceof ChallengeRequest that)) {
 			return false;
 		}
 
-		final ChallengeRequest that = (ChallengeRequest) obj;
-
-		return getParameters().equals(that.getParameters()) && Objects.equals(getRealm(), that.getRealm())
+		return getParameters().equals(that.getParameters())
+				&& Objects.equals(getRealm(), that.getRealm())
 				&& Objects.equals(getScheme(), that.getScheme());
 	}
 
 	/**
 	 * Returns the base URI references that collectively define the protected
-	 * domains for the digest authentication. By default it return a list with a
+	 * domains for the digest authentication. By default, it returns a list with a
 	 * single "/" URI reference.
 	 * 
 	 * @return The base URI references.

org.restlet/src/main/java/org/restlet/data/Cookie.java

@@ -97,15 +97,15 @@ public boolean equals(Object obj) {
 			return true;
 		}
 
-		if (!(obj instanceof Cookie)) {
+		if (!(obj instanceof Cookie that)) {
 			// if obj isn't a cookie or is null don't evaluate further
 			return false;
 		}
 
-		Cookie that = (Cookie) obj;
-
-		return Objects.equals(getName(), that.getName()) && Objects.equals(getValue(), that.getValue())
-				&& (this.version == that.version) && Objects.equals(getDomain(), that.getDomain())
+		return Objects.equals(getName(), that.getName())
+				&& Objects.equals(getValue(), that.getValue())
+				&& (this.version == that.version)
+				&& Objects.equals(getDomain(), that.getDomain())
 				&& Objects.equals(getPath(), that.getPath());
 	}
 

org.restlet/src/main/java/org/restlet/data/CookieSetting.java

@@ -26,7 +26,7 @@
  */
 public final class CookieSetting extends Cookie {
 	/**
-	 * Indicates whether to restrict cookie access to untrusted parties. Currently
+	 * Indicates whether to restrict cookie access to untrusted parties. Currently,
 	 * this toggles the non-standard but widely supported HttpOnly cookie parameter.
 	 */
 	private volatile boolean accessRestricted;
@@ -139,13 +139,13 @@ public boolean equals(Object obj) {
 		if (obj == this) {
 			return true;
 		}
-		if (!(obj instanceof CookieSetting)) {
+		if (!(obj instanceof CookieSetting that)) {
 			return false;
 		}
 
-		CookieSetting that = (CookieSetting) obj;
-
-		return super.equals(obj) && this.maxAge == that.maxAge && this.secure == that.secure
+		return super.equals(obj)
+				&& this.maxAge == that.maxAge
+				&& this.secure == that.secure
 				&& Objects.equals(this.comment, that.comment);
 	}
 

org.restlet/src/main/java/org/restlet/data/Expectation.java

@@ -26,7 +26,7 @@
 public final class Expectation implements NamedValue<String> {
 
 	/**
-	 * Creates a "100-continue" expectation. If a client will wait for a 100
+	 * Creates a "100-continue" expectation. If a client waits for a 100
 	 * (Continue) provisional response before sending the request body, it MUST send
 	 * this expectation. A client MUST NOT send this expectation if it does not
 	 * intend to send a request entity.
@@ -76,13 +76,12 @@ public boolean equals(Object obj) {
 			return true;
 		}
 
-		if (!(obj instanceof Expectation)) {
+		if (!(obj instanceof Expectation that)) {
 			return false;
 		}
 
-		Expectation that = (Expectation) obj;
-
-		return Objects.equals(getName(), that.getName()) && Objects.equals(getValue(), that.getValue())
+		return Objects.equals(getName(), that.getName())
+				&& Objects.equals(getValue(), that.getValue())
 				&& getParameters().equals(that.getParameters());
 	}
 

org.restlet/src/main/java/org/restlet/data/Header.java

@@ -51,12 +51,12 @@ public boolean equals(Object obj) {
 		if (obj == this) {
 			return true;
 		}
-		if (!(obj instanceof Header)) {
+		if (!(obj instanceof Header that)) {
 			return false;
 		}
 
-		Header that = (Header) obj;
-		return Objects.equals(getName(), that.getName()) && Objects.equals(getValue(), that.getValue());
+		return Objects.equals(getName(), that.getName())
+				&& Objects.equals(getValue(), that.getValue());
 	}
 
 	/**