DefaultExceptionMapper made public

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
eclipse-ee4j · Dec 15, 2021 · 1142023 · 1142023
1 parent 140b4ab
commit 1142023
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...jersey/server/DefaultExceptionMapper.java → ...rsey/internal/DefaultExceptionMapper.java b/...jersey/server/DefaultExceptionMapper.java → ...rsey/internal/DefaultExceptionMapper.java
@@ -14,13 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.server;
+package org.glassfish.jersey.internal;
 
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 
-class DefaultExceptionMapper implements ExceptionMapper<Throwable> {
+public final class DefaultExceptionMapper implements ExceptionMapper<Throwable> {
     @Override
     public Response toResponse(Throwable exception) {
         return (exception instanceof WebApplicationException)

diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/ExceptionMapperFactory.java b/core-common/src/main/java/org/glassfish/jersey/internal/ExceptionMapperFactory.java
@@ -188,7 +188,8 @@ private LazyValue<Set<ExceptionMapperType>> createLazyExceptionMappers(Injection
                     for (final Type contract : contracts) {
                         if (contract instanceof Class
                                 && ExceptionMapper.class.isAssignableFrom((Class<?>) contract)
-                                && contract != ExceptionMapper.class) {
+                                && contract != ExceptionMapper.class
+                                && contract != DefaultExceptionMapper.class) {
                             //noinspection unchecked
                             mapperTypes.add((Class<? extends ExceptionMapper>) contract);
                         }

diff --git a/core-server/src/main/java/org/glassfish/jersey/server/ServerRuntime.java b/core-server/src/main/java/org/glassfish/jersey/server/ServerRuntime.java
@@ -54,6 +54,7 @@
 
 import jakarta.inject.Provider;
 
+import org.glassfish.jersey.internal.DefaultExceptionMapper;
 import org.glassfish.jersey.internal.guava.Preconditions;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Injections;