use Paths.get() when querying repositories

fixes #2558

Author: Vladimir Kotal

apiary.apib

@@ -192,16 +192,19 @@ will be used for repository paths.
 
 ### return type of the repository [GET]
 
-The repository path is relative to source root, starting with slash.
-Repository type is separated from the repository path with a colon.
+The repository path is relative to source root.
+
+In the response the repository type is separated from the repository path
+with a colon. If the type cannot be determined "N/A" is returned.
 
 + Response 200 (text/plain)
   + Body
 
             /opengrok-master:git
 
 + Parameters
-  + repository - repository for which to return type
+  + repository - repository path with native path separators (of the machine
+  running the service) starting with path separator for which to return type
 
 ## Search [/search{?full,def,symbol,path,hist,type,projects,maxresults,start}]
 

opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/RepositoriesController.java

@@ -39,13 +39,13 @@ public class RepositoriesController {
     @GET
     @Path("/type")
     @Produces(MediaType.TEXT_PLAIN)
-    public String getType(@QueryParam("repository") final String repository) {
+    public String getType(@QueryParam("repository") final String repositoryPath) {
         for (RepositoryInfo ri : env.getRepositories()) {
-            if (ri.getDirectoryNameRelative().equals(repository)) {
-                return repository + ":" + ri.getType();
+            if (ri.getDirectoryNameRelative().equals(repositoryPath)) {
+                return repositoryPath + ":" + ri.getType();
             }
         }
-        return repository + ":N/A";
+        return repositoryPath + ":N/A";
     }
 
 }

opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/RepositoriesControllerTest.java

@@ -41,6 +41,7 @@
 
 import javax.ws.rs.core.Application;
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -88,10 +89,13 @@ public void tearDown() throws Exception {
     }
 
     @Test
-    public void testGetRepositoryType() throws Exception {
-        assertEquals("/totally-nonexistent-repository:N/A",
-                getRepoType("/totally-nonexistent-repository"));
+    public void testGetRepositoryTypeOfNonExistenRepository() throws Exception {
+        assertEquals(Paths.get("/totally-nonexistent-repository").toString() + ":N/A",
+                getRepoType(Paths.get("/totally-nonexistent-repository").toString()));
+    }
 
+    @Test
+    public void testGetRepositoryType() throws Exception {
         // Create subrepository.
         File mercurialRoot = new File(repository.getSourceRoot() + File.separator + "mercurial");
         MercurialRepositoryTest.runHgCommand(mercurialRoot,
@@ -111,11 +115,12 @@ public void testGetRepositoryType() throws Exception {
                 new ArrayList<>(), // don't zap cache
                 false); // don't list repos
 
-        assertEquals("/mercurial:Mercurial", getRepoType("/mercurial"));
-
-        assertEquals("/mercurial/closed:Mercurial", getRepoType("/mercurial/closed"));
-
-        assertEquals("/git:git", getRepoType("/git"));
+        assertEquals(Paths.get("/mercurial").toString() + ":Mercurial",
+                getRepoType(Paths.get("/mercurial").toString()));
+        assertEquals(Paths.get("/mercurial/closed").toString() + ":Mercurial",
+                getRepoType(Paths.get("/mercurial/closed").toString()));
+        assertEquals(Paths.get("/git").toString() + ":git",
+                getRepoType(Paths.get("/git").toString()));
     }
 
     private String getRepoType(final String repository) {