Remove exception mapping for java.security.AccessControlException (#…

…6405) `java.security.AccessControlException` has been deprecated for removal for a while, and Nessie no longer throws this exception. Handling this exception is no longer needed.
projectnessie · Mar 27, 2023 · c4effde · c4effde
1 parent 1e31074
commit c4effde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...-services/src/main/java/org/projectnessie/services/restjakarta/NessieExceptionMapper.java b/...-services/src/main/java/org/projectnessie/services/restjakarta/NessieExceptionMapper.java
@@ -23,7 +23,6 @@
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
-import java.security.AccessControlException;
 import java.util.stream.Collectors;
 import org.projectnessie.error.BaseNessieClientServerException;
 import org.projectnessie.error.ErrorCode;
@@ -76,8 +75,7 @@ public Response toResponse(Exception exception) {
       LOGGER.warn("Backend throttled/refused the request: {}", exception.toString());
       errorCode = ErrorCode.TOO_MANY_REQUESTS;
       message = "Backend store refused to process the request: " + exception;
-    } else if (exception instanceof AccessControlException
-        || exception instanceof AccessCheckException) {
+    } else if (exception instanceof AccessCheckException) {
       errorCode = ErrorCode.FORBIDDEN;
       message = exception.getMessage();
     } else if (exception instanceof NotSupportedException) {

diff --git a/...st-services/src/main/java/org/projectnessie/services/restjavax/NessieExceptionMapper.java b/...st-services/src/main/java/org/projectnessie/services/restjavax/NessieExceptionMapper.java
@@ -18,7 +18,6 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.google.common.base.Throwables;
-import java.security.AccessControlException;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.ws.rs.NotSupportedException;
@@ -76,8 +75,7 @@ public Response toResponse(Exception exception) {
       LOGGER.warn("Backend throttled/refused the request: {}", exception.toString());
       errorCode = ErrorCode.TOO_MANY_REQUESTS;
       message = "Backend store refused to process the request: " + exception;
-    } else if (exception instanceof AccessControlException
-        || exception instanceof AccessCheckException) {
+    } else if (exception instanceof AccessCheckException) {
       errorCode = ErrorCode.FORBIDDEN;
       message = exception.getMessage();
     } else if (exception instanceof NotSupportedException) {