(jena) branch main updated: Accept error should be 406

[andy]

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


The following commit(s) were added to refs/heads/main by this push:
     new 71a9279f08 Accept error should be 406
71a9279f08 is described below

commit 71a9279f08c65fa01726d5eba07513e58bc34dbd
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Fri Mar 7 16:14:56 2025 +0000

    Accept error should be 406
---
 jena-arq/src/main/java/org/apache/jena/web/HttpSC.java              | 3 ---
 .../src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java    | 2 +-
 .../main/java/org/apache/jena/fuseki/servlets/ActionPrefixesR.java  | 2 +-
 .../src/test/java/org/apache/jena/fuseki/test/HttpTest.java         | 6 ++++++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java 
b/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java
index 955f29dd00..cf0607dfe6 100644
--- a/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java
+++ b/jena-arq/src/main/java/org/apache/jena/web/HttpSC.java
@@ -88,9 +88,6 @@ public class HttpSC {
      public static final int RANGE_NOT_SATISFIABLE_416 = 416;
      public static final int EXPECTATION_FAILED_417 = 417;
 
-//     @Deprecated
-//     public static final int I_AM_A_TEAPOT_418 = 418;
-
      public static final int IM_A_TEAPOT_418 = 418;
      public static final int ENHANCE_YOUR_CALM_420 = 420;
      public static final int MISDIRECTED_REQUEST_421 = 421;
diff --git 
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
 
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
index 3f6dcd7d8a..9cdf3f2d1c 100644
--- 
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
+++ 
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
@@ -333,7 +333,7 @@ public class ActionLib {
     }
 
     /**
-     * Output a graph to the HTTP response (does not set the status code) 
using the given Content-Type string.
+     * Output a graph to the HTTP response using the given Content-Type string.
      * One of {@code lang} and {@code fmt} maybe null and will be calculated.
      * {@code actualContentType} maybe null in which case the standard content 
type for the syntax is used.
      */
diff --git 
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionPrefixesR.java
 
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionPrefixesR.java
index 17207e9e94..61bfc3a559 100644
--- 
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionPrefixesR.java
+++ 
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionPrefixesR.java
@@ -173,7 +173,7 @@ public class ActionPrefixesR extends ActionPrefixesBase {
                 case WebContent.contentTypeTextPlain -> responseText(action, 
prefix, namespace);
                 case WebContent.contentTypeJSON -> responseJSON(action, 
prefix, namespace);
                 default ->
-                    ServletOps.error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415);
+                    ServletOps.error(HttpSC.NOT_ACCEPTABLE_406);
             }
             FmtLog.info(action.log, "[%d] %s -> %s", action.id, prefix, 
namespace);
             ServletOps.success(action);
diff --git 
a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
 
b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
index 4026519bd0..1c8248e494 100644
--- 
a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
+++ 
b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
@@ -62,6 +62,12 @@ public class HttpTest {
         execWithHttpException(HttpSC.METHOD_NOT_ALLOWED_405, action);
     }
 
+    // 406 : "Accept:" failure
+    public static void expect406(Runnable action) {
+        execWithHttpException(HttpSC.NOT_ACCEPTABLE_406, action);
+    }
+
+    // 415 : Can not receive Content-Type
     public static void expect415(Runnable action) {
         execWithHttpException(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, action);
     }