DemoRequest serializable fix

geoserver · Jan 22, 2016 · 5acfc20 · 5acfc20
1 parent 834084d
commit 5acfc20
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequest.java b/src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequest.java
@@ -7,8 +7,6 @@
 
 import java.io.Serializable;
 
-import org.geoserver.platform.resource.Resource;
-
 /**
  * Holds on the properties used as arguments for the TestWfsPost servlet
  * 
@@ -17,10 +15,12 @@
  * @since 2.0.x
  */
 public class DemoRequest implements Serializable {
+    private static final long serialVersionUID = -6605104556907827822L;
+
     /**
      * The directory containing the demo files
      */
-    private final Resource demoDir;
+    private final String demoDir;
 
     private String requestFileName;
 
@@ -32,7 +32,7 @@ public class DemoRequest implements Serializable {
 
     private String password;
 
-    public DemoRequest(final Resource demoDir) {
+    public DemoRequest(final String demoDir) {
         this.demoDir = demoDir;
     }
 
@@ -76,7 +76,7 @@ public void setRequestBody(String requestBody) {
         this.requestBody = requestBody;
     }
 
-    public Resource getDemoDir() {
+    public String getDemoDir() {
         return demoDir;
     }
 }
diff --git a/src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequestsPage.java b/src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequestsPage.java
@@ -77,7 +77,7 @@ public DemoRequestsPage() {
             throw new WicketRuntimeException("Can't access demo requests directory: "
                     + e.getMessage());
         }
-        DemoRequest model = new DemoRequest(demoDir);
+        DemoRequest model = new DemoRequest(demoDir.path());
         setDefaultModel(new Model(model));
 
         setUpDemoRequestsForm(demoDir);
@@ -90,7 +90,7 @@ public DemoRequestsPage() {
      */
     DemoRequestsPage(final Resource demoDir) {
         this.demoDir = demoDir;
-        DemoRequest model = new DemoRequest(demoDir);
+        DemoRequest model = new DemoRequest(demoDir.path());
         setDefaultModel(new Model(model));
         setUpDemoRequestsForm(demoDir);
     }

diff --git a/src/web/demo/src/test/java/org/geoserver/web/demo/DemoRequestsPageTest.java b/src/web/demo/src/test/java/org/geoserver/web/demo/DemoRequestsPageTest.java
@@ -109,7 +109,7 @@ public void testUrlLinkUnmodified() {
         assertTrue(model.getObject() instanceof DemoRequest);
         DemoRequest req = (DemoRequest) model.getObject();
 
-        assertEquals(demoDir, req.getDemoDir().dir());
+        assertEquals(demoDir.getPath(), req.getDemoDir());
         String requestFileName = req.getRequestFileName();
         String requestUrl = req.getRequestUrl();
         String requestBody = req.getRequestBody();
@@ -146,7 +146,7 @@ public void testUrlLinkSelected() {
         assertTrue(model.getObject() instanceof DemoRequest);
         DemoRequest req = (DemoRequest) model.getObject();
 
-        assertEquals(demoDir, req.getDemoDir().dir());
+        assertEquals(demoDir.getPath(), req.getDemoDir());
         String requestFileName = req.getRequestFileName();
         String requestUrl = req.getRequestUrl();
         String requestBody = req.getRequestBody();
@@ -221,7 +221,7 @@ public void testProxyBaseUrl() {
             assertTrue(model.getObject() instanceof DemoRequest);
             DemoRequest req = (DemoRequest) model.getObject();
 
-            assertEquals(demoDir, req.getDemoDir().dir());
+            assertEquals(demoDir.getPath(), req.getDemoDir());
             String requestFileName = req.getRequestFileName();
             String requestUrl = req.getRequestUrl();