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/

[ol...@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<Artifact> quickSearch( String queryString )
         throws ArchivaRestServiceException
     {
@@ -216,7 +220,6 @@ public class DefaultSearchService
     protected List<Artifact> 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 @@
     <jaxrs:providers>
       <ref bean="authenticationInterceptor#rest"/>
       <ref bean="permissionInterceptor#rest"/>
-      <ref bean="httpContextThreadLocalInterceptor#rest"/>
       <ref bean="archivaRestServiceExceptionMapper"/>
     </jaxrs:providers>
 
@@ -62,7 +61,6 @@
 
     <jaxrs:outInterceptors>
       <ref bean="threadLocalUserCleaner#rest"/>
-      <ref bean="httpContextThreadLocalCleaner#rest"/>
     </jaxrs:outInterceptors>
 
     <jaxrs:outFaultInterceptors>