GEOS-7335: org.geoserver.catalog.rest.CoverageStoreFileUploadTest fai…

…ls on windows
geoserver · Dec 4, 2015 · f2a5c40 · f2a5c40
1 parent e68bc90
commit f2a5c40
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/platform/src/main/java/org/geoserver/platform/resource/Resources.java b/src/platform/src/main/java/org/geoserver/platform/resource/Resources.java
@@ -428,7 +428,7 @@ public static org.geoserver.platform.resource.Resource fromPath(String path,
         if (file.isAbsolute()) {
             return Files.asResource(file);
         } else {
-            return relativeDir.get(path);
+            return relativeDir.get(path.replace(File.separatorChar, '/'));
         }
     }
 

diff --git a/src/restconfig/src/main/java/org/geoserver/catalog/rest/CoverageStoreFileResource.java b/src/restconfig/src/main/java/org/geoserver/catalog/rest/CoverageStoreFileResource.java
@@ -7,6 +7,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -150,29 +151,34 @@ public void handlePut() {
 
             String defaultRoot = "/data/" + workspace + "/" + coveragestore;
 
-            StringBuilder fileBuilder = new StringBuilder(Resources.find(uploadedFile).getAbsolutePath());
+            StringBuilder urlBuilder;
+            try {
+                urlBuilder = new StringBuilder(Resources.find(uploadedFile).toURI().toURL().toString());
+            } catch (MalformedURLException e) {
+                throw new RestletException("Error create building coverage URL", Status.SERVER_ERROR_INTERNAL, e);
+            }
 
             String url;
             if(uploadedFile.getType() == Type.DIRECTORY && uploadedFile.name().equals(coveragestore)) {
 
-                int def = fileBuilder.indexOf(defaultRoot);
+                int def = urlBuilder.indexOf(defaultRoot);
 
                 if(def >= 0){
                     url = "file:data/" + workspace + "/" + coveragestore;
                 }else{
-                    url = fileBuilder.toString();
+                    url = urlBuilder.toString();
                 }
             } else {
 
-                int def = fileBuilder.indexOf(defaultRoot);
+                int def = urlBuilder.indexOf(defaultRoot);
 
                 if(def >= 0){
 
-                    String itemPath = fileBuilder.substring(def + defaultRoot.length());
+                    String itemPath = urlBuilder.substring(def + defaultRoot.length());
 
                     url = "file:data/" + workspace + "/" + coveragestore + itemPath;
                 }else{
-                    url = fileBuilder.toString();
+                    url = urlBuilder.toString();
                 }
             }
             if (url.contains("+")) {

diff --git a/src/restconfig/src/main/java/org/geoserver/catalog/rest/StoreFileResource.java b/src/restconfig/src/main/java/org/geoserver/catalog/rest/StoreFileResource.java
@@ -121,14 +121,8 @@ private org.geoserver.platform.resource.Resource createFinalRoot(String workspac
                         || (workspaceName != null && coverage.getWorkspace().getName()
                                 .equalsIgnoreCase(workspaceName))) {
                     // If the coverage exists then the associated directory is defined by its URL
-                    File dirFile = DataUtilities.urlToFile(new URL(coverage.getURL()));
+                    directory = Resources.fromPath(DataUtilities.urlToFile(new URL(coverage.getURL())).getPath(),
-
+                            catalog.getResourceLoader().get(""));
-                    // If the directory is relative and then the directory is searched inside the data directory
-                    if (dirFile.isAbsolute()) {
-                        directory = Files.asResource(dirFile);
-                    } else {
-                        directory = catalog.getResourceLoader().get(dirFile.getPath());
-                    }
                 }
             }
         }