Replacing deprecated DefaultServiceExceptionHandler with its superclass

geoserver · Jun 1, 2019 · 2bf4eaf · 2bf4eaf
1 parent ad5de20
commit 2bf4eaf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 35 deletions.
diff --git a/src/ows/src/main/java/org/geoserver/ows/DefaultServiceExceptionHandler.java b/src/ows/src/main/java/org/geoserver/ows/DefaultServiceExceptionHandler.java
diff --git a/src/ows/src/main/java/org/geoserver/ows/Dispatcher.java b/src/ows/src/main/java/org/geoserver/ows/Dispatcher.java
@@ -1770,7 +1770,7 @@ void handleServiceException(ServiceException se, Service service, Request reques
 
         if (handler == null) {
             // none found, fall back on default
-            handler = new DefaultServiceExceptionHandler();
+            handler = new OWS10ServiceExceptionHandler();
         }
 
         // if SOAP request use special SOAP exception handler, but only for OWS requests because

diff --git a/...s/DefaultServiceExceptionHandlerTest.java → ...ows/OWS10ServiceExceptionHandlerTest.java b/...s/DefaultServiceExceptionHandlerTest.java → ...ows/OWS10ServiceExceptionHandlerTest.java
@@ -20,9 +20,9 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-public class DefaultServiceExceptionHandlerTest extends TestCase {
+public class OWS10ServiceExceptionHandlerTest extends TestCase {
 
-    private DefaultServiceExceptionHandler handler;
+    private OWS10ServiceExceptionHandler handler;
     private MockHttpServletRequest request;
     private MockHttpServletResponse response;
     private Request requestInfo;
@@ -52,7 +52,7 @@ public int getServerPort() {
 
         response = new MockHttpServletResponse();
 
-        handler = new DefaultServiceExceptionHandler();
+        handler = new OWS10ServiceExceptionHandler();
 
         requestInfo = new Request();
         requestInfo.setHttpRequest(request);

diff --git a/src/wcs1_0/src/main/java/org/geoserver/wcs/response/LegacyServiceExceptionHandler.java b/src/wcs1_0/src/main/java/org/geoserver/wcs/response/LegacyServiceExceptionHandler.java
@@ -15,7 +15,6 @@
 import java.util.logging.Level;
 import javax.servlet.http.HttpServletResponse;
 import org.geoserver.config.GeoServer;
-import org.geoserver.ows.DefaultServiceExceptionHandler;
 import org.geoserver.ows.Request;
 import org.geoserver.ows.ServiceExceptionHandler;
 import org.geoserver.ows.util.OwsUtils;
@@ -29,7 +28,7 @@
  * <code>ServiceExceptionReport</code> document.
  *
  * <p>This handler is referred to as "legacy" as newer services move to the ows style exception
- * report. See {@link DefaultServiceExceptionHandler}.
+ * report. See {@link org.geoserver.ows.OWS10ServiceExceptionHandler}.
  *
  * <p>
  *