From 23ea72b3c89d676a8fc2715308af0ed2eaa06cb2 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 24 Jun 2012 16:15:45 +0200
Subject: [PATCH] use repository createUrl instead of deprecated getUrl

---
 .../resources/RepositoryRootResource.java     | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java
index 9a11e74a6f..48a0d7f975 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java
@@ -42,7 +42,6 @@ import com.google.inject.Inject;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.repository.RepositoryTypePredicate;
-import sonia.scm.repository.RepositoryUtil;
 import sonia.scm.template.TemplateHandler;
 import sonia.scm.url.UrlProvider;
 import sonia.scm.url.UrlProviderFactory;
@@ -116,15 +115,15 @@ public class RepositoryRootResource
           @PathParam("type") final String type)
           throws IOException
   {
-    UrlProvider uiUrlProvider =
-      UrlProviderFactory.createUrlProvider(HttpUtil.getCompleteUrl(request),
-        UrlProviderFactory.TYPE_WUI);
+    String baseUrl = HttpUtil.getCompleteUrl(request);
+    UrlProvider uiUrlProvider = UrlProviderFactory.createUrlProvider(baseUrl,
+                                  UrlProviderFactory.TYPE_WUI);
     //J-
     Collection<RepositoryTemplateElement> unsortedRepositories =
       Collections2.transform( 
         Collections2.filter(
             repositoryManager.getAll(), new RepositoryTypePredicate(type))
-        , new RepositoryTransformFunction(request, repositoryManager, uiUrlProvider)
+        , new RepositoryTransformFunction(uiUrlProvider, baseUrl)
       );
     
     List<RepositoryTemplateElement> repositories = Ordering.from(
@@ -160,12 +159,14 @@ public class RepositoryRootResource
      *
      * @param repository
      * @param uiUrlProvider
+     * @param baseUrl
      */
     public RepositoryTemplateElement(Repository repository,
-                                     UrlProvider uiUrlProvider)
+                                     UrlProvider uiUrlProvider, String baseUrl)
     {
       this.repository = repository;
       this.urlProvider = uiUrlProvider;
+      this.baseUrl = baseUrl;
     }
 
     //~--- get methods --------------------------------------------------------
@@ -236,11 +237,14 @@ public class RepositoryRootResource
      */
     public String getUrl()
     {
-      return repository.getUrl();
+      return repository.createUrl(baseUrl);
     }
 
     //~--- fields -------------------------------------------------------------
 
+    /** Field description */
+    private String baseUrl;
+
     /** Field description */
     private Repository repository;
 
@@ -298,13 +302,10 @@ public class RepositoryRootResource
      * @param request
      * @param repositoryManager
      * @param urlProvider
+     * @param baseUrl
      */
-    public RepositoryTransformFunction(HttpServletRequest request,
-                                       RepositoryManager repositoryManager,
-                                       UrlProvider urlProvider)
+    public RepositoryTransformFunction(UrlProvider urlProvider, String baseUrl)
     {
-      this.request = request;
-      this.repositoryManager = repositoryManager;
       this.urlProvider = urlProvider;
     }
 
@@ -321,18 +322,13 @@ public class RepositoryRootResource
     @Override
     public RepositoryTemplateElement apply(Repository repository)
     {
-      RepositoryUtil.appendUrl(request, repositoryManager, repository);
-
-      return new RepositoryTemplateElement(repository, urlProvider);
+      return new RepositoryTemplateElement(repository, urlProvider, baseUrl);
     }
 
     //~--- fields -------------------------------------------------------------
 
     /** Field description */
-    private RepositoryManager repositoryManager;
-
-    /** Field description */
-    private HttpServletRequest request;
+    private String baseUrl;
 
     /** Field description */
     private UrlProvider urlProvider;