This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit f855413f4c1bc286052290f3f369aa6a3e89b9a0 Author: Andy Seaborne <[email protected]> AuthorDate: Sun Nov 30 18:10:37 2025 +0000 Clean up of HTTP method name constants --- jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java | 1 + .../java/org/apache/jena/fuseki/servlets/ActionProcessor.java | 3 ++- .../main/java/org/apache/jena/fuseki/servlets/ServletBase.java | 9 --------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java index 520ff4e3cb..a7b8be22e6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java @@ -96,6 +96,7 @@ public class HttpNames public static final String paramForceAccept = "force-accept" ; // Force the accept header at the last moment public static final String paramTimeout = "timeout" ; + // Replace by enum HttpMethods public static final String METHOD_DELETE = "DELETE"; public static final String METHOD_HEAD = "HEAD"; public static final String METHOD_GET = "GET"; diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java index 44085722aa..32b4491136 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java @@ -31,12 +31,13 @@ public interface ActionProcessor { public default void process(HttpAction action) { switch ( action.getRequestMethod() ) { case METHOD_GET -> execGet(action); + //case METHOD_QUERY -> execQuery(action); case METHOD_POST -> execPost(action); case METHOD_PATCH -> execPatch(action); case METHOD_PUT -> execPut(action); case METHOD_DELETE -> execDelete(action); case METHOD_HEAD -> execHead(action); - case METHOD_OPTIONS-> execOptions(action); + case METHOD_OPTIONS -> execOptions(action); case METHOD_TRACE -> execTrace(action); default -> execAny(action.getRequestMethod(), action); } diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java index 8b9c465ba1..cdd2ec0803 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java @@ -32,15 +32,6 @@ import org.apache.jena.riot.web.HttpNames; */ public abstract class ServletBase extends HttpServlet { - public static final String METHOD_DELETE = "DELETE"; - public static final String METHOD_HEAD = "HEAD"; - public static final String METHOD_GET = "GET"; - public static final String METHOD_OPTIONS = "OPTIONS"; - public static final String METHOD_POST = "POST"; - public static final String METHOD_PUT = "PUT"; - public static final String METHOD_TRACE = "TRACE"; - public static final String METHOD_PATCH = "PATCH"; - private static AtomicLong requestIdAlloc = new AtomicLong(0); protected ServletBase() {}
