GH-4376 fix usage of deprecated spring/spring-boot APIs

eclipse-rdf4j · Jan 19, 2023 · 0be39c2 · 0be39c2
1 parent 863b89c
commit 0be39c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...st/java/org/eclipse/rdf4j/http/server/readonly/MemoryBackedOnlySparqlApplicationTest.java b/...st/java/org/eclipse/rdf4j/http/server/readonly/MemoryBackedOnlySparqlApplicationTest.java
@@ -26,7 +26,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Import;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)

diff --git a/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/ServerInterceptor.java b/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/ServerInterceptor.java
@@ -13,7 +13,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.HandlerInterceptor;
 
 /**
  * Base class for single-use request interceptors. This implementation sets the thread name to something sensible at the
@@ -22,7 +22,7 @@
  *
  * @author Herko ter Horst
  */
-public abstract class ServerInterceptor extends HandlerInterceptorAdapter {
+public abstract class ServerInterceptor implements HandlerInterceptor {
 
 	private volatile String origThreadName;
 
@@ -34,7 +34,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
 		setRequestAttributes(request);
 
-		return super.preHandle(request, response, handler);
+		return HandlerInterceptor.super.preHandle(request, response, handler);
 	}
 
 	@Override