Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E57D679E8 for ; Wed, 23 Nov 2011 17:16:08 +0000 (UTC) Received: (qmail 25108 invoked by uid 500); 23 Nov 2011 17:16:08 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 25058 invoked by uid 500); 23 Nov 2011 17:16:08 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 25046 invoked by uid 99); 23 Nov 2011 17:16:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Nov 2011 17:16:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Nov 2011 17:16:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E62DF23889CB for ; Wed, 23 Nov 2011 17:15:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1205494 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main: java/org/apache/archiva/rest/services/ java/org/apache/archiva/rest/services/interceptors/ resources/META-INF/ Date: Wed, 23 Nov 2011 17:15:43 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111123171543.E62DF23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Wed Nov 23 17:15:42 2011 New Revision: 1205494 URL: http://svn.apache.org/viewvc?rev=1205494&view=rev Log: simplify with using @Context annotation from jaxrs to get HttpServletRequest in rest services Removed: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContext.java archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocalCleaner.java archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocalInterceptor.java Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java?rev=1205494&r1=1205493&r2=1205494&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java Wed Nov 23 17:15:42 2011 @@ -48,6 +48,7 @@ import org.springframework.stereotype.Se import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.core.Context; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -68,6 +69,9 @@ public class DefaultSearchService @Inject private UserRepositories userRepositories; + @Context + private HttpServletRequest httpServletRequest; + public List quickSearch( String queryString ) throws ArchivaRestServiceException { @@ -216,7 +220,6 @@ public class DefaultSearchService protected List getArtifacts( SearchResults searchResults ) { - HttpContext httpContext = HttpContextThreadLocal.get(); if ( searchResults == null || searchResults.isEmpty() ) { return Collections.emptyList(); @@ -235,7 +238,7 @@ public class DefaultSearchService if ( StringUtils.isNotBlank( version ) ) { versionned.setVersion( version ); - versionned.setUrl( getArtifactUrl( httpContext, versionned ) ); + versionned.setUrl( getArtifactUrl( versionned ) ); artifacts.add( versionned ); @@ -248,17 +251,13 @@ public class DefaultSearchService /** * TODO add a configuration mechanism to have configured the base archiva url - * @param httpContext * @param artifact * @return */ - private String getArtifactUrl( HttpContext httpContext, Artifact artifact ) + private String getArtifactUrl( Artifact artifact ) { - if ( httpContext == null ) - { - return null; - } - if ( httpContext.getHttpServletRequest() == null ) + + if ( httpServletRequest == null ) { return null; } @@ -266,7 +265,7 @@ public class DefaultSearchService { return null; } - StringBuilder sb = new StringBuilder( getBaseUrl( httpContext.getHttpServletRequest() ) ); + StringBuilder sb = new StringBuilder( getBaseUrl( httpServletRequest ) ); sb.append( "/repository" ); if ( !StringUtils.startsWith( artifact.getUrl(), "/" ) ) Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1205494&r1=1205493&r2=1205494&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml Wed Nov 23 17:15:42 2011 @@ -44,7 +44,6 @@ - @@ -62,7 +61,6 @@ -