GH-3559 initial refactor

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>

core/http/protocol/src/main/java/org/eclipse/rdf4j/http/protocol/transaction/TransactionSAXParser.java

@@ -90,7 +90,7 @@ public void startTag(String tagName, Map<String, String> atts, String text) thro
  String encoding = atts.get(TransactionXMLConstants.ENCODING_ATT);
 
  if (encoding != null && "base64".equalsIgnoreCase(encoding)) {
- text = new String(javax.xml.bind.DatatypeConverter.parseBase64Binary(text));
+ text = new String(jakarta.xml.bind.DatatypeConverter.parseBase64Binary(text));
  }
  Literal lit;
  if (lang != null) {

core/http/protocol/src/main/java/org/eclipse/rdf4j/http/protocol/transaction/TransactionWriter.java

@@ -11,8 +11,6 @@
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 
-import javax.xml.bind.DatatypeConverter;
-
 import org.eclipse.rdf4j.common.xml.XMLUtil;
 import org.eclipse.rdf4j.common.xml.XMLWriter;
 import org.eclipse.rdf4j.http.protocol.transaction.operations.AddStatementOperation;
@@ -35,6 +33,8 @@
 import org.eclipse.rdf4j.query.Dataset;
 import org.eclipse.rdf4j.rio.helpers.RDFStarUtil;
 
+import jakarta.xml.bind.DatatypeConverter;
+
 /**
  * Serializes of an RDF transaction.
  *

core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/AbstractRDFParser.java

@@ -18,8 +18,6 @@
 import java.util.Set;
 import java.util.UUID;
 
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-
 import org.eclipse.rdf4j.common.net.ParsedIRI;
 import org.eclipse.rdf4j.model.BNode;
 import org.eclipse.rdf4j.model.IRI;
@@ -38,6 +36,8 @@
 import org.eclipse.rdf4j.rio.RDFParser;
 import org.eclipse.rdf4j.rio.RioSetting;
 
+import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter;
+
 /**
  * Base class for {@link RDFParser}s offering common functionality for RDF parsers.
  *
@@ -428,7 +428,7 @@ protected IRI createURI(String uri) throws RDFParseException {
 
  /**
  * Creates a new {@link BNode} or Skolem {@link IRI} object.
- * 
+ *
  * @return blank node or skolem IRI
  */
  protected Resource createNode() throws RDFParseException {
@@ -450,7 +450,7 @@ protected Resource createNode() throws RDFParseException {
 
  /**
  * Creates a {@link BNode} or Skolem {@link IRI} object for the specified identifier.
- * 
+ *
  * @param nodeID node identifier
  * @return blank node or skolem IRI
  */
@@ -789,7 +789,7 @@ private final String createUniqueBNodePrefix() {
 
  /**
  * Parse skolem origin, if set
- * 
+ *
  * @return skolem origin or null
  */
  private ParsedIRI getCachedSkolemOrigin() {

spring-components/rdf4j-spring-demo/src/main/java/org/eclipse/rdf4j/spring/demo/support/InitialDataInserter.java

@@ -8,14 +8,14 @@
 
 package org.eclipse.rdf4j.spring.demo.support;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.rdf4j.spring.support.DataInserter;
 import org.springframework.core.io.Resource;
 
+import jakarta.annotation.PostConstruct;
+
 /**
  * Inserts data from the specified TTL file into the repository at startup.
- * 
+ *
  * @since 4.0.0
  * @author Florian Kleedorfer
  */

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/repository/remote/RemoteRepositoryProperties.java

@@ -8,12 +8,12 @@
 
 package org.eclipse.rdf4j.spring.repository.remote;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-
 import org.hibernate.validator.constraints.Length;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+
 /**
  * @since 4.0.0
  * @author Gabriel Pickl

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/uuidsource/sequence/UUIDSequenceConfig.java

@@ -8,14 +8,14 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.sequence;
 
-import javax.validation.Valid;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import jakarta.validation.Valid;
+
 /**
  * @since 4.0.0
  * @author Florian Kleedorfer

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/uuidsource/sequence/UUIDSequenceProperties.java

@@ -8,11 +8,11 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.sequence;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+
 /**
  * @since 4.0.0
  * @author Florian Kleedorfer

spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/uuidsource/simple/SimpleRepositoryUUIDSourceProperties.java

@@ -8,10 +8,10 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.simple;
 
-import javax.validation.constraints.NotBlank;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import jakarta.validation.constraints.NotBlank;
+
 /**
  * @since 4.0.0
  * @author Florian Kleedorfer

spring-components/spring-boot-sparql-web/src/main/java/org/eclipse/rdf4j/http/server/readonly/QueryResponder.java

@@ -14,9 +14,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.annotation.Experimental;
 import org.eclipse.rdf4j.common.lang.FileFormat;
 import org.eclipse.rdf4j.model.IRI;
@@ -48,6 +45,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 @Experimental
 @RestController
 public class QueryResponder {
@@ -180,7 +180,7 @@ protected void evaluate(Query q, String acceptHeader, HttpServletResponse respon
  /**
  * Test if the query is of a type that can be answered. And that the accept headers allow for the response to be
  * send.
- * 
+ *
  * @param preparedQuery
  * @param acceptHeader
  * @return true if the query is of the right type and acceptHeaders are acceptable.

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/CommonValuesHandlerInterceptor.java

@@ -9,12 +9,12 @@
 
 import java.util.Calendar;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Interceptor that inserts some commonly used values into the model. The inserted values are: - path, equal to
  * request.getContextPath() (e.g. /context) - basePath, equal to the fully qualified context path (e.g.

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/MessageHandlerInterceptor.java

@@ -7,14 +7,14 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.webapp;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
 /**
  * Interceptor that inserts some commonly used values into the model. The inserted values are: - path, equal to
  * request.getContextPath() (e.g. /context) - basePath, equal to the fully qualified context path (e.g.

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/filters/PathFilter.java

@@ -11,15 +11,15 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 /**
  * @author Herko ter Horst

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/navigation/NavigationHandlerInterceptor.java

@@ -7,13 +7,13 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.webapp.navigation;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
 /**
  * Interceptor that inserts the navigation model for the current Spring view into the model.
  *

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/system/SystemInfoController.java

@@ -15,13 +15,13 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.AppConfiguration;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SystemInfoController implements Controller {
 
  private String view;

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/system/SystemOverviewController.java

@@ -10,13 +10,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.AppConfiguration;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SystemOverviewController implements Controller {
 
  private String view;

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/system/logging/LoggingOverviewController.java

@@ -14,15 +14,15 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.AppConfiguration;
 import org.eclipse.rdf4j.common.logging.LogLevel;
 import org.eclipse.rdf4j.common.logging.LogReader;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class LoggingOverviewController implements Controller {
 
  private AppConfiguration config;

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/system/proxy/ProxySettingsController.java

@@ -10,11 +10,11 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.net.ProxySettings;
 import org.eclipse.rdf4j.common.webapp.util.HttpServerUtil;
 
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * @author Herko ter Horst
  */

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/util/HttpServerUtil.java

@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class HttpServerUtil {
 

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/views/EmptySuccessView.java

@@ -7,15 +7,15 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.webapp.views;
 
-import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.web.servlet.View;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * @author Herko ter Horst
  */

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/views/SimpleCustomResponseView.java

@@ -10,13 +10,13 @@
 import java.io.InputStream;
 import java.util.Map;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.io.IOUtil;
 import org.springframework.web.servlet.View;
 
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * @author Herko ter Horst
  */

tools/server-spring/src/main/java/org/eclipse/rdf4j/common/webapp/views/SimpleResponseView.java

@@ -11,11 +11,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.web.servlet.View;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * @author Herko ter Horst
  */