Early support for Jakarta Servlet 6.2 and Jakarta Activation 2.2

Closes gh-35670

Author: jhoeller

spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java

@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Path;
 
 import jakarta.activation.FileTypeMap;
 import jakarta.activation.MimetypesFileTypeMap;
@@ -178,4 +179,9 @@ public String getContentType(String fileName) {
 		return getFileTypeMap().getContentType(fileName);
 	}
 
+	// @Override - on Activation 2.2
+	public String getContentType(Path path) {
+		return getFileTypeMap().getContentType(path.getFileName().toString());
+	}
+
 }

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -55,7 +55,7 @@
 /**
  * Mock implementation of the {@link jakarta.servlet.http.HttpServletResponse} interface.
  *
- * <p>As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline.
+ * <p>As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
@@ -827,6 +827,10 @@ public int getStatus() {
 		return this.errorMessage;
 	}
 
+	// @Override - on Servlet 6.2
+	public void sendEarlyHints() {
+	}
+
 
 	//---------------------------------------------------------------------
 	// Methods for MockRequestDispatcher

spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java

@@ -55,7 +55,7 @@
 /**
  * Mock implementation of the {@link jakarta.servlet.http.HttpServletResponse} interface.
  *
- * <p>As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline.
+ * <p>As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
@@ -827,6 +827,10 @@ public int getStatus() {
 		return this.errorMessage;
 	}
 
+	// @Override - on Servlet 6.2
+	public void sendEarlyHints() {
+	}
+
 
 	//---------------------------------------------------------------------
 	// Methods for MockRequestDispatcher

spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java

@@ -660,7 +660,6 @@ public Collection<String> getHeaderNames() {
 			return this.headers.headerNames();
 		}
 
-
 		// Unsupported
 
 		@Override
@@ -713,7 +712,6 @@ public void addIntHeader(String name, int value) {
 			throw new UnsupportedOperationException();
 		}
 
-
 		@Override
 		public String getCharacterEncoding() {
 			throw new UnsupportedOperationException();
@@ -793,6 +791,11 @@ public void setLocale(Locale loc) {
 		public Locale getLocale() {
 			throw new UnsupportedOperationException();
 		}
+
+		// @Override - on Servlet 6.2
+		public void sendEarlyHints() {
+			throw new UnsupportedOperationException();
+		}
 	}
 
 }