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 96b7d1ce3d634201cd3d73087dd67fbc37bce38e Author: Andy Seaborne <[email protected]> AuthorDate: Tue Dec 3 22:41:01 2024 +0000 Use ServletOps.errorMethodNotAllowed where possible --- .../main/java/org/apache/jena/fuseki/ctl/ActionContainerItem.java | 4 +--- .../src/main/java/org/apache/jena/fuseki/ctl/ActionItem.java | 5 ++--- .../src/main/java/org/apache/jena/fuseki/ctl/ActionTasks.java | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionContainerItem.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionContainerItem.java index c4261daf94..1d62880090 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionContainerItem.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionContainerItem.java @@ -26,7 +26,6 @@ import org.apache.jena.atlas.json.JsonValue; import org.apache.jena.fuseki.servlets.ActionLib; import org.apache.jena.fuseki.servlets.HttpAction; import org.apache.jena.fuseki.servlets.ServletOps; -import org.apache.jena.web.HttpSC; /** Base for actions that are container and also have actions on items */ public abstract class ActionContainerItem extends ActionCtl { @@ -44,10 +43,9 @@ public abstract class ActionContainerItem extends ActionCtl { else if ( method.equals(METHOD_DELETE) ) performDelete(action); else - ServletOps.error(HttpSC.METHOD_NOT_ALLOWED_405); + ServletOps.errorMethodNotAllowed(action.getMethod()); } - @Override public void execOptions(HttpAction action) { ActionLib.doOptionsGetPostDeleteHead(action); diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionItem.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionItem.java index 8db54ff3a1..ccc360ea47 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionItem.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionItem.java @@ -21,7 +21,6 @@ package org.apache.jena.fuseki.ctl; import org.apache.jena.atlas.json.JsonValue; import org.apache.jena.fuseki.servlets.HttpAction; import org.apache.jena.fuseki.servlets.ServletOps; -import org.apache.jena.web.HttpSC; /** Action on items in a container, but not the container itself */ public abstract class ActionItem extends ActionContainerItem @@ -31,14 +30,14 @@ public abstract class ActionItem extends ActionContainerItem @Override final protected JsonValue execGetContainer(HttpAction action) { - ServletOps.error(HttpSC.METHOD_NOT_ALLOWED_405); + ServletOps.errorMethodNotAllowed(action.getMethod()); return null; } @Override final protected JsonValue execPostContainer(HttpAction action) { - ServletOps.error(HttpSC.METHOD_NOT_ALLOWED_405); + ServletOps.errorMethodNotAllowed(action.getMethod()); return null; } } diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionTasks.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionTasks.java index 1e57a79605..0d573b26ce 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionTasks.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionTasks.java @@ -28,7 +28,6 @@ import org.apache.jena.fuseki.async.AsyncTask; import org.apache.jena.fuseki.servlets.ActionLib; import org.apache.jena.fuseki.servlets.HttpAction; import org.apache.jena.fuseki.servlets.ServletOps; -import org.apache.jena.web.HttpSC; public class ActionTasks extends ActionCtl { @@ -63,7 +62,7 @@ public class ActionTasks extends ActionCtl else if ( method.equals(METHOD_POST) ) execPost(action, name); else - ServletOps.error(HttpSC.METHOD_NOT_ALLOWED_405); + ServletOps.errorMethodNotAllowed(action.getMethod()); } private void execGet(HttpAction action, String name) {
