Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 01:15:44 +01:00
Code Issues Packages Projects Releases Activity

use repository createUrl instead of deprecated getUrl

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-06-24 16:15:45 +02:00
parent 25f0776414
commit 23ea72b3c8
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java
View File

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