From b310f597dfc5606d0fb6e15450857deb73ef01ef Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 29 May 2012 16:35:48 +0000 Subject: [PATCH] remove non needed parameters git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1343831 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/archiva/rest/services/AbstractRestService.java | 2 +- .../apache/archiva/rest/services/DefaultBrowseService.java | 2 +- .../apache/archiva/rest/services/DefaultSearchService.java | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index f7aaf895e..b95fd1ee3 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -176,7 +176,7 @@ public abstract class AbstractRestService * @param artifact * @return */ - protected String getArtifactUrl( Artifact artifact, String version ) + protected String getArtifactUrl( Artifact artifact ) throws ArchivaRestServiceException { try diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 262bae592..2ef6db202 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -688,7 +688,7 @@ public class DefaultBrowseService repositoryContentFactory.getManagedRepositoryContent( repoId ) ); Artifact art = builder.build(); - art.setUrl( getArtifactUrl( art, version ) ); + art.setUrl( getArtifactUrl( art ) ); artifactDownloadInfos.add( art ); } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java index b9b1d810d..d33985117 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java @@ -20,7 +20,6 @@ package org.apache.archiva.rest.services; */ import net.sf.beanlib.provider.replicator.BeanReplicator; -import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.indexer.search.RepositorySearch; import org.apache.archiva.indexer.search.RepositorySearchException; import org.apache.archiva.indexer.search.SearchFields; @@ -39,7 +38,6 @@ import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import javax.inject.Inject; -import javax.ws.rs.core.Response; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -225,7 +223,7 @@ public class DefaultSearchService if ( StringUtils.isNotBlank( version ) ) { versionned.setVersion( version ); - versionned.setUrl( getArtifactUrl( versionned, version ) ); + versionned.setUrl( getArtifactUrl( versionned ) ); artifacts.add( versionned ); @@ -237,6 +235,4 @@ public class DefaultSearchService } - - }