Sweeping under the rug a bit of deprecatd org.vfny stuff, unfortunate…

…ly the package is not deprecated as a whole, but we should remove it

src/main/src/main/java/org/geoserver/ows/adapters/ResponseAdapter.java

@@ -14,8 +14,6 @@
 import org.geoserver.ows.util.OwsUtils;
 import org.geoserver.platform.Operation;
 import org.geoserver.platform.ServiceException;
-import org.vfny.geoserver.Request;
-import org.vfny.geoserver.Response;
 
 /**
  * Wraps an old style {@link Response} in a new {@link org.geoserver.ows.Response}.
@@ -25,6 +23,7 @@
  *
  * @author Justin Deoliveira, The Open Planning Project, jdeolive@openplans.org
  */
+@SuppressWarnings("deprecation")
 public class ResponseAdapter extends org.geoserver.ows.Response {
     GeoServer gs;
 
@@ -36,10 +35,13 @@ public ResponseAdapter(Class delegateClass, GeoServer gs) {
 
     public String getMimeType(Object value, Operation operation) throws ServiceException {
         // get the delegate
-        Response delegate = (Response) value;
+        org.vfny.geoserver.Response delegate = (org.vfny.geoserver.Response) value;
 
         // get the requst object from the operation
-        Request request = (Request) OwsUtils.parameter(operation.getParameters(), Request.class);
+        org.vfny.geoserver.Request request =
+                (org.vfny.geoserver.Request)
+                        OwsUtils.parameter(
+                                operation.getParameters(), org.vfny.geoserver.Request.class);
 
         // the old contract specifies that execute must be called before
         // get content type
@@ -52,14 +54,14 @@ public String getMimeType(Object value, Operation operation) throws ServiceExcep
     public void write(Object value, OutputStream output, Operation operation)
             throws IOException, ServiceException {
         // get the delegate
-        Response delegate = (Response) value;
+        org.vfny.geoserver.Response delegate = (org.vfny.geoserver.Response) value;
 
         // write the response
         delegate.writeTo(output);
     }
 
     public String[][] getHeaders(Object value, Operation operation) throws ServiceException {
-        Response delegate = (Response) value;
+        org.vfny.geoserver.Response delegate = (org.vfny.geoserver.Response) value;
         HashMap map = new HashMap();
         if (delegate.getContentDisposition() != null) {
             map.put("Content-Disposition", delegate.getContentDisposition());

src/main/src/main/java/org/vfny/geoserver/Response.java

@@ -61,6 +61,7 @@
  * @version $Id$
  * @deprecated implement {@link org.geoserver.ows.Response} instead
  */
+@SuppressWarnings("deprecation")
 public interface Response {
     /**
      * Excecutes a request. If this method finalizes without throwing an Exception, the Response

src/main/src/main/java/org/vfny/geoserver/util/requests/readers/KvpRequestReader.java

@@ -40,7 +40,6 @@
 import org.opengis.filter.FilterFactory;
 import org.opengis.filter.Id;
 import org.springframework.context.ApplicationContextAware;
-import org.vfny.geoserver.Request;
 import org.vfny.geoserver.util.requests.FilterHandlerImpl;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
@@ -64,6 +63,7 @@
  * @author Gabriel Roldan
  * @version $Id$
  */
+@SuppressWarnings("deprecation")
 public abstract class KvpRequestReader implements ApplicationContextAware {
     /** Class logger */
     private static Logger LOGGER =
@@ -122,7 +122,8 @@ protected boolean keyExists(String key) {
      * returns the propper Request subclass for the set of parameters it was setted up and the kind
      * of request it is specialized for
      */
-    public abstract Request getRequest(HttpServletRequest request) throws ServiceException;
+    public abstract org.vfny.geoserver.Request getRequest(HttpServletRequest request)
+            throws ServiceException;
 
     /**
      * Attempts to parse out the proper typeNames from the FeatureId filters. It simply uses the

src/main/src/main/java/org/vfny/geoserver/util/requests/readers/XmlRequestReader.java

@@ -10,7 +10,6 @@
 import javax.servlet.http.HttpServletRequest;
 import org.geoserver.config.ServiceInfo;
 import org.geoserver.platform.ServiceException;
-import org.vfny.geoserver.Request;
 
 /**
  * This utility reads in XML requests and returns them as appropriate request objects.
@@ -20,6 +19,7 @@
  * @author Gabriel Rold?n
  * @version $Id$
  */
+@SuppressWarnings("deprecation")
 public abstract class XmlRequestReader {
     /** Class logger */
     protected static Logger LOGGER =
@@ -29,7 +29,8 @@ public abstract class XmlRequestReader {
     private ServiceInfo serviceConfig;
 
     /** */
-    public abstract Request read(Reader reader, HttpServletRequest req) throws ServiceException;
+    public abstract org.vfny.geoserver.Request read(Reader reader, HttpServletRequest req)
+            throws ServiceException;
 
     /**
      * This will create a new XmlRequestReader

src/wms/src/test/java/org/geoserver/wms/GetMapTest.java

@@ -14,7 +14,6 @@
 import org.geoserver.wms.WMSMockData.DummyRasterMapProducer;
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.filter.function.EnvFunction;
-import org.geotools.ows.wms.response.GetMapResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.locationtech.jts.geom.Envelope;
@@ -49,7 +48,6 @@ public void setUp() throws Exception {
         getMapOp = new GetMap(mockData.getWMS());
     }
 
-    /** Test method for {@link GetMapResponse#execute(org.vfny.geoserver.Request)}. */
     @Test
     public void testExecuteNoExtent() {
         request.setBbox(null);