archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marti...@apache.org
Subject [13/15] archiva git commit: Implementation of new archivaindexer
Date Fri, 10 Nov 2017 23:20:56 GMT
http://git-wip-us.apache.org/repos/asf/archiva/blob/c6e4e563/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
deleted file mode 100644
index b6f4984..0000000
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
+++ /dev/null
@@ -1,737 +0,0 @@
-package org.apache.archiva.indexer.search;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.archiva.admin.model.RepositoryAdminException;
-import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.archiva.admin.model.beans.ProxyConnector;
-import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
-import org.apache.archiva.indexer.util.SearchUtil;
-import org.apache.archiva.model.ArchivaArtifactModel;
-import org.apache.archiva.model.ArtifactReference;
-import org.apache.commons.lang.StringUtils;
-import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.index.FlatSearchRequest;
-import org.apache.maven.index.FlatSearchResponse;
-import org.apache.maven.index.MAVEN;
-import org.apache.maven.index.NexusIndexer;
-import org.apache.maven.index.OSGI;
-import org.apache.maven.index.QueryCreator;
-import org.apache.maven.index.SearchType;
-import org.apache.maven.index.context.IndexingContext;
-import org.apache.maven.index.expr.SearchExpression;
-import org.apache.maven.index.expr.SearchTyped;
-import org.apache.maven.index.expr.SourcedSearchExpression;
-import org.apache.maven.index.expr.UserInputSearchExpression;
-import org.apache.maven.index_shaded.lucene.search.BooleanClause;
-import org.apache.maven.index_shaded.lucene.search.BooleanClause.Occur;
-import org.apache.maven.index_shaded.lucene.search.BooleanQuery;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * RepositorySearch implementation which uses the Maven Indexer for searching.
- */
-@Service( "repositorySearch#maven" )
-public class MavenRepositorySearch
-    implements RepositorySearch
-{
-    private Logger log = LoggerFactory.getLogger( getClass() );
-
-    private NexusIndexer indexer;
-
-    private QueryCreator queryCreator;
-
-    private ManagedRepositoryAdmin managedRepositoryAdmin;
-
-    private ProxyConnectorAdmin proxyConnectorAdmin;
-
-    protected MavenRepositorySearch()
-    {
-        // for test purpose
-    }
-
-    @Inject
-    public MavenRepositorySearch( NexusIndexer nexusIndexer, ManagedRepositoryAdmin managedRepositoryAdmin,
-                                  ProxyConnectorAdmin proxyConnectorAdmin, QueryCreator queryCreator )
-        throws PlexusSisuBridgeException
-    {
-        this.indexer = nexusIndexer;
-        this.queryCreator = queryCreator;
-        this.managedRepositoryAdmin = managedRepositoryAdmin;
-        this.proxyConnectorAdmin = proxyConnectorAdmin;
-    }
-
-    /**
-     * @see RepositorySearch#search(String, List, String, SearchResultLimits, List)
-     */
-    @Override
-    public SearchResults search( String principal, List<String> selectedRepos, String term, SearchResultLimits limits,
-                                 List<String> previousSearchTerms )
-        throws RepositorySearchException
-    {
-        List<String> indexingContextIds = addIndexingContexts( selectedRepos );
-
-        // since upgrade to nexus 2.0.0, query has changed from g:[QUERIED TERM]* to g:*[QUERIED TERM]*
-        //      resulting to more wildcard searches so we need to increase max clause count
-        BooleanQuery.setMaxClauseCount( Integer.MAX_VALUE );
-        BooleanQuery q = new BooleanQuery();
-
-        if ( previousSearchTerms == null || previousSearchTerms.isEmpty() )
-        {
-            constructQuery( term, q );
-        }
-        else
-        {
-            for ( String previousTerm : previousSearchTerms )
-            {
-                BooleanQuery iQuery = new BooleanQuery();
-                constructQuery( previousTerm, iQuery );
-
-                q.add( iQuery, BooleanClause.Occur.MUST );
-            }
-
-            BooleanQuery iQuery = new BooleanQuery();
-            constructQuery( term, iQuery );
-            q.add( iQuery, BooleanClause.Occur.MUST );
-        }
-
-        // we retun only artifacts without classifier in quick search, olamy cannot find a way to say with this field empty
-        // FIXME  cannot find a way currently to setup this in constructQuery !!!
-        return search( limits, q, indexingContextIds, NoClassifierArtifactInfoFilter.LIST, selectedRepos, true );
-
-    }
-
-    /**
-     * @see RepositorySearch#search(String, SearchFields, SearchResultLimits)
-     */
-    @Override
-    public SearchResults search( String principal, SearchFields searchFields, SearchResultLimits limits )
-        throws RepositorySearchException
-    {
-        if ( searchFields.getRepositories() == null )
-        {
-            throw new RepositorySearchException( "Repositories cannot be null." );
-        }
-
-        List<String> indexingContextIds = addIndexingContexts( searchFields.getRepositories() );
-
-        // if no index found in the specified ones return an empty search result instead of doing a search on all index
-        // olamy: IMHO doesn't make sense
-        if ( !searchFields.getRepositories().isEmpty() && ( indexingContextIds == null
-            || indexingContextIds.isEmpty() ) )
-        {
-            return new SearchResults();
-        }
-
-        BooleanQuery q = new BooleanQuery();
-        if ( StringUtils.isNotBlank( searchFields.getGroupId() ) )
-        {
-            q.add( indexer.constructQuery( MAVEN.GROUP_ID, searchFields.isExactSearch() ? new SourcedSearchExpression(
-                       searchFields.getGroupId() ) : new UserInputSearchExpression( searchFields.getGroupId() ) ),
-                   BooleanClause.Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getArtifactId() ) )
-        {
-            q.add( indexer.constructQuery( MAVEN.ARTIFACT_ID,
-                                           searchFields.isExactSearch()
-                                               ? new SourcedSearchExpression( searchFields.getArtifactId() )
-                                               : new UserInputSearchExpression( searchFields.getArtifactId() ) ),
-                   BooleanClause.Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getVersion() ) )
-        {
-            q.add( indexer.constructQuery( MAVEN.VERSION, searchFields.isExactSearch() ? new SourcedSearchExpression(
-                       searchFields.getVersion() ) : new SourcedSearchExpression( searchFields.getVersion() ) ),
-                   BooleanClause.Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getPackaging() ) )
-        {
-            q.add( indexer.constructQuery( MAVEN.PACKAGING, searchFields.isExactSearch() ? new SourcedSearchExpression(
-                       searchFields.getPackaging() ) : new UserInputSearchExpression( searchFields.getPackaging() ) ),
-                   BooleanClause.Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getClassName() ) )
-        {
-            q.add( indexer.constructQuery( MAVEN.CLASSNAMES,
-                                           new UserInputSearchExpression( searchFields.getClassName() ) ),
-                   BooleanClause.Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleSymbolicName() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.SYMBOLIC_NAME,
-                                           new UserInputSearchExpression( searchFields.getBundleSymbolicName() ) ),
-                   BooleanClause.Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleVersion() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.VERSION,
-                                           new UserInputSearchExpression( searchFields.getBundleVersion() ) ),
-                   BooleanClause.Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleExportPackage() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.EXPORT_PACKAGE,
-                                           new UserInputSearchExpression( searchFields.getBundleExportPackage() ) ),
-                   Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleExportService() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.EXPORT_SERVICE,
-                                           new UserInputSearchExpression( searchFields.getBundleExportService() ) ),
-                   Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleImportPackage() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.IMPORT_PACKAGE,
-                                           new UserInputSearchExpression( searchFields.getBundleImportPackage() ) ),
-                   Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleName() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.NAME, new UserInputSearchExpression( searchFields.getBundleName() ) ),
-                   Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleImportPackage() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.IMPORT_PACKAGE,
-                                           new UserInputSearchExpression( searchFields.getBundleImportPackage() ) ),
-                   Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getBundleRequireBundle() ) )
-        {
-            q.add( indexer.constructQuery( OSGI.REQUIRE_BUNDLE,
-                                           new UserInputSearchExpression( searchFields.getBundleRequireBundle() ) ),
-                   Occur.MUST );
-        }
-
-        if ( StringUtils.isNotBlank( searchFields.getClassifier() ) )
-        {
-            q.add( indexer.constructQuery( MAVEN.CLASSIFIER, searchFields.isExactSearch() ? new SourcedSearchExpression(
-                       searchFields.getClassifier() ) : new UserInputSearchExpression( searchFields.getClassifier() ) ),
-                   Occur.MUST );
-        }
-        else if ( searchFields.isExactSearch() )
-        {
-            //TODO improvement in case of exact search and no classifier we must query for classifier with null value
-            // currently it's done in DefaultSearchService with some filtering
-        }
-
-        if ( q.getClauses() == null || q.getClauses().length <= 0 )
-        {
-            throw new RepositorySearchException( "No search fields set." );
-        }
-        System.err.println("CLAUSES "+q.getClauses());
-        if (q.getClauses()!=null) {
-            for (BooleanClause cl : q.getClauses()) {
-                System.err.println("Clause "+cl);
-            }
-        }
-
-        return search( limits, q, indexingContextIds, Collections.<ArtifactInfoFilter>emptyList(),
-                       searchFields.getRepositories(), searchFields.isIncludePomArtifacts() );
-    }
-
-    private static class NullSearch
-        implements SearchTyped, SearchExpression
-    {
-        private static final NullSearch INSTANCE = new NullSearch();
-
-        @Override
-        public String getStringValue()
-        {
-            return "[[NULL_VALUE]]";
-        }
-
-        @Override
-        public SearchType getSearchType()
-        {
-            return SearchType.EXACT;
-        }
-    }
-
-    private SearchResults search( SearchResultLimits limits, BooleanQuery q, List<String> indexingContextIds,
-                                  List<? extends ArtifactInfoFilter> filters, List<String> selectedRepos,
-                                  boolean includePoms )
-        throws RepositorySearchException
-    {
-
-        try
-        {
-            FlatSearchRequest request = new FlatSearchRequest( q );
-
-            request.setContexts( getIndexingContexts( indexingContextIds ) );
-            if ( limits != null )
-            {
-                // we apply limits only when first page asked
-                if ( limits.getSelectedPage() == 0 )
-                {
-                    request.setCount( limits.getPageSize() * ( Math.max( 1, limits.getSelectedPage() ) ) );
-                }
-            }
-
-            FlatSearchResponse response = indexer.searchFlat( request );
-
-            if ( response == null || response.getTotalHits() == 0 )
-            {
-                SearchResults results = new SearchResults();
-                results.setLimits( limits );
-                return results;
-            }
-
-            return convertToSearchResults( response, limits, filters, selectedRepos, includePoms );
-        }
-        catch ( IOException e )
-        {
-            throw new RepositorySearchException( e.getMessage(), e );
-        }
-        catch ( RepositoryAdminException e )
-        {
-            throw new RepositorySearchException( e.getMessage(), e );
-        }
-
-    }
-
-    private List<IndexingContext> getIndexingContexts( List<String> ids )
-    {
-        List<IndexingContext> contexts = new ArrayList<>( ids.size() );
-
-        for ( String id : ids )
-        {
-            IndexingContext context = indexer.getIndexingContexts().get( id );
-            if ( context != null )
-            {
-                contexts.add( context );
-            }
-            else
-            {
-                log.warn( "context with id {} not exists", id );
-            }
-        }
-
-        return contexts;
-    }
-
-    private void constructQuery( String term, BooleanQuery q )
-    {
-        q.add( indexer.constructQuery( MAVEN.GROUP_ID, new UserInputSearchExpression( term ) ), Occur.SHOULD );
-        q.add( indexer.constructQuery( MAVEN.ARTIFACT_ID, new UserInputSearchExpression( term ) ), Occur.SHOULD );
-        q.add( indexer.constructQuery( MAVEN.VERSION, new UserInputSearchExpression( term ) ), Occur.SHOULD );
-        q.add( indexer.constructQuery( MAVEN.PACKAGING, new UserInputSearchExpression( term ) ), Occur.SHOULD );
-        q.add( indexer.constructQuery( MAVEN.CLASSNAMES, new UserInputSearchExpression( term ) ), Occur.SHOULD );
-
-        //Query query =
-        //    new WildcardQuery( new Term( MAVEN.CLASSNAMES.getFieldName(), "*" ) );
-        //q.add( query, Occur.MUST_NOT );
-        // olamy IMHO we could set this option as at least one must match
-        //q.setMinimumNumberShouldMatch( 1 );
-    }
-
-
-    /**
-     * @param selectedRepos
-     * @return indexing contextId used
-     */
-    private List<String> addIndexingContexts( List<String> selectedRepos )
-    {
-        Set<String> indexingContextIds = new HashSet<>();
-        for ( String repo : selectedRepos )
-        {
-            try
-            {
-                ManagedRepository repoConfig = managedRepositoryAdmin.getManagedRepository( repo );
-
-                if ( repoConfig != null )
-                {
-
-                    IndexingContext context = managedRepositoryAdmin.createIndexContext( repoConfig );
-                    if ( context.isSearchable() )
-                    {
-                        indexingContextIds.addAll( getRemoteIndexingContextIds( repo ) );
-                        indexingContextIds.add( context.getId() );
-                    }
-                    else
-                    {
-                        log.warn( "indexingContext with id {} not searchable", repoConfig.getId() );
-                    }
-
-                }
-                else
-                {
-                    log.warn( "Repository '{}' not found in configuration.", repo );
-                }
-            }
-            catch ( RepositoryAdminException e )
-            {
-                log.warn( "RepositoryAdminException occured while accessing index of repository '{}' : {}", repo,
-                          e.getMessage() );
-                continue;
-            }
-            catch ( RepositorySearchException e )
-            {
-                log.warn( "RepositorySearchException occured while accessing index of repository '{}' : {}", repo,
-                    e.getMessage() );
-                continue;
-            }
-        }
-
-        return new ArrayList<>( indexingContextIds );
-    }
-
-
-    @Override
-    public Set<String> getRemoteIndexingContextIds( String managedRepoId )
-        throws RepositorySearchException
-    {
-        Set<String> ids = new HashSet<>();
-
-        List<ProxyConnector> proxyConnectors = null;
-        try
-        {
-            proxyConnectors = proxyConnectorAdmin.getProxyConnectorAsMap().get( managedRepoId );
-        }
-        catch ( RepositoryAdminException e )
-        {
-            throw new RepositorySearchException( e.getMessage(), e );
-        }
-
-        if ( proxyConnectors == null || proxyConnectors.isEmpty() )
-        {
-            return ids;
-        }
-
-        for ( ProxyConnector proxyConnector : proxyConnectors )
-        {
-            String remoteId = "remote-" + proxyConnector.getTargetRepoId();
-            IndexingContext context = indexer.getIndexingContexts().get( remoteId );
-            if ( context != null && context.isSearchable() )
-            {
-                ids.add( remoteId );
-            }
-        }
-
-        return ids;
-    }
-
-    @Override
-    public Collection<String> getAllGroupIds( String principal, List<String> selectedRepos )
-        throws RepositorySearchException
-    {
-        List<IndexingContext> indexContexts = getIndexingContexts( selectedRepos );
-
-        if ( indexContexts == null || indexContexts.isEmpty() )
-        {
-            return Collections.emptyList();
-        }
-
-        try
-        {
-            Set<String> allGroupIds = new HashSet<>();
-            for ( IndexingContext indexingContext : indexContexts )
-            {
-                allGroupIds.addAll( indexingContext.getAllGroups() );
-            }
-            return allGroupIds;
-        }
-        catch ( IOException e )
-        {
-            throw new RepositorySearchException( e.getMessage(), e );
-        }
-
-    }
-
-    private SearchResults convertToSearchResults( FlatSearchResponse response, SearchResultLimits limits,
-                                                  List<? extends ArtifactInfoFilter> artifactInfoFilters,
-                                                  List<String> selectedRepos, boolean includePoms )
-        throws RepositoryAdminException
-    {
-        SearchResults results = new SearchResults();
-        Set<ArtifactInfo> artifactInfos = response.getResults();
-
-        for ( ArtifactInfo artifactInfo : artifactInfos )
-        {
-            if ( StringUtils.equalsIgnoreCase( "pom", artifactInfo.getFileExtension() ) && !includePoms )
-            {
-                continue;
-            }
-            String id = SearchUtil.getHitId( artifactInfo.getGroupId(), //
-                                             artifactInfo.getArtifactId(), //
-                                             artifactInfo.getClassifier(), //
-                                             artifactInfo.getPackaging() );
-            Map<String, SearchResultHit> hitsMap = results.getHitsMap();
-
-
-            if ( !applyArtifactInfoFilters( artifactInfo, artifactInfoFilters, hitsMap ) )
-            {
-                continue;
-            }
-
-            SearchResultHit hit = hitsMap.get( id );
-            if ( hit != null )
-            {
-                if ( !hit.getVersions().contains( artifactInfo.getVersion() ) )
-                {
-                    hit.addVersion( artifactInfo.getVersion() );
-                }
-            }
-            else
-            {
-                hit = new SearchResultHit();
-                hit.setArtifactId( artifactInfo.getArtifactId() );
-                hit.setGroupId( artifactInfo.getGroupId() );
-                hit.setRepositoryId( artifactInfo.getRepository() );
-                hit.addVersion( artifactInfo.getVersion() );
-                hit.setBundleExportPackage( artifactInfo.getBundleExportPackage() );
-                hit.setBundleExportService( artifactInfo.getBundleExportService() );
-                hit.setBundleSymbolicName( artifactInfo.getBundleSymbolicName() );
-                hit.setBundleVersion( artifactInfo.getBundleVersion() );
-                hit.setBundleDescription( artifactInfo.getBundleDescription() );
-                hit.setBundleDocUrl( artifactInfo.getBundleDocUrl() );
-                hit.setBundleRequireBundle( artifactInfo.getBundleRequireBundle() );
-                hit.setBundleImportPackage( artifactInfo.getBundleImportPackage() );
-                hit.setBundleLicense( artifactInfo.getBundleLicense() );
-                hit.setBundleName( artifactInfo.getBundleName() );
-                hit.setContext( artifactInfo.getContext() );
-                hit.setGoals( artifactInfo.getGoals() );
-                hit.setPrefix( artifactInfo.getPrefix() );
-                hit.setPackaging( artifactInfo.getPackaging() );
-                hit.setClassifier( artifactInfo.getClassifier() );
-                hit.setFileExtension( artifactInfo.getFileExtension() );
-                hit.setUrl( getBaseUrl( artifactInfo, selectedRepos ) );
-            }
-
-            results.addHit( id, hit );
-        }
-
-        results.setTotalHits( response.getTotalHitsCount() );
-        results.setTotalHitsMapSize( results.getHitsMap().values().size() );
-        results.setReturnedHitsCount( response.getReturnedHitsCount() );
-        results.setLimits( limits );
-
-        if ( limits == null || limits.getSelectedPage() == SearchResultLimits.ALL_PAGES )
-        {
-            return results;
-        }
-        else
-        {
-            return paginate( results );
-        }
-    }
-
-    /**
-     * calculate baseUrl without the context and base Archiva Url
-     *
-     * @param artifactInfo
-     * @return
-     */
-    protected String getBaseUrl( ArtifactInfo artifactInfo, List<String> selectedRepos )
-        throws RepositoryAdminException
-    {
-        StringBuilder sb = new StringBuilder();
-        if ( StringUtils.startsWith( artifactInfo.getContext(), "remote-" ) )
-        {
-            // it's a remote index result we search a managed which proxying this remote and on which
-            // current user has read karma
-            String managedRepoId =
-                getManagedRepoId( StringUtils.substringAfter( artifactInfo.getContext(), "remote-" ), selectedRepos );
-            if ( managedRepoId != null )
-            {
-                sb.append( '/' ).append( managedRepoId );
-                artifactInfo.setContext( managedRepoId );
-            }
-        }
-        else
-        {
-            sb.append( '/' ).append( artifactInfo.getContext() );
-        }
-
-        sb.append( '/' ).append( StringUtils.replaceChars( artifactInfo.getGroupId(), '.', '/' ) );
-        sb.append( '/' ).append( artifactInfo.getArtifactId() );
-        sb.append( '/' ).append( artifactInfo.getVersion() );
-        sb.append( '/' ).append( artifactInfo.getArtifactId() );
-        sb.append( '-' ).append( artifactInfo.getVersion() );
-        if ( StringUtils.isNotBlank( artifactInfo.getClassifier() ) )
-        {
-            sb.append( '-' ).append( artifactInfo.getClassifier() );
-        }
-        // maven-plugin packaging is a jar
-        if ( StringUtils.equals( "maven-plugin", artifactInfo.getPackaging() ) )
-        {
-            sb.append( "jar" );
-        }
-        else
-        {
-            sb.append( '.' ).append( artifactInfo.getPackaging() );
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * return a managed repo for a remote result
-     *
-     * @param remoteRepo
-     * @param selectedRepos
-     * @return
-     * @throws RepositoryAdminException
-     */
-    private String getManagedRepoId( String remoteRepo, List<String> selectedRepos )
-        throws RepositoryAdminException
-    {
-        Map<String, List<ProxyConnector>> proxyConnectorMap = proxyConnectorAdmin.getProxyConnectorAsMap();
-        if ( proxyConnectorMap == null || proxyConnectorMap.isEmpty() )
-        {
-            return null;
-        }
-        if ( selectedRepos != null && !selectedRepos.isEmpty() )
-        {
-            for ( Map.Entry<String, List<ProxyConnector>> entry : proxyConnectorMap.entrySet() )
-            {
-                if ( selectedRepos.contains( entry.getKey() ) )
-                {
-                    for ( ProxyConnector proxyConnector : entry.getValue() )
-                    {
-                        if ( StringUtils.equals( remoteRepo, proxyConnector.getTargetRepoId() ) )
-                        {
-                            return proxyConnector.getSourceRepoId();
-                        }
-                    }
-                }
-            }
-        }
-
-        // we don't find in search selected repos so return the first one
-        for ( Map.Entry<String, List<ProxyConnector>> entry : proxyConnectorMap.entrySet() )
-        {
-
-            for ( ProxyConnector proxyConnector : entry.getValue() )
-            {
-                if ( StringUtils.equals( remoteRepo, proxyConnector.getTargetRepoId() ) )
-                {
-                    return proxyConnector.getSourceRepoId();
-                }
-            }
-
-        }
-        return null;
-    }
-
-    private boolean applyArtifactInfoFilters( ArtifactInfo artifactInfo,
-                                              List<? extends ArtifactInfoFilter> artifactInfoFilters,
-                                              Map<String, SearchResultHit> currentResult )
-    {
-        if ( artifactInfoFilters == null || artifactInfoFilters.isEmpty() )
-        {
-            return true;
-        }
-
-        ArchivaArtifactModel artifact = new ArchivaArtifactModel();
-        artifact.setArtifactId( artifactInfo.getArtifactId() );
-        artifact.setClassifier( artifactInfo.getClassifier() );
-        artifact.setGroupId( artifactInfo.getGroupId() );
-        artifact.setRepositoryId( artifactInfo.getRepository() );
-        artifact.setVersion( artifactInfo.getVersion() );
-        artifact.setChecksumMD5( artifactInfo.getMd5() );
-        artifact.setChecksumSHA1( artifactInfo.getSha1() );
-        for ( ArtifactInfoFilter filter : artifactInfoFilters )
-        {
-            if ( !filter.addArtifactInResult( artifact, currentResult ) )
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    protected SearchResults paginate( SearchResults results )
-    {
-        SearchResultLimits limits = results.getLimits();
-        SearchResults paginated = new SearchResults();
-
-        // ( limits.getPageSize() * ( Math.max( 1, limits.getSelectedPage() ) ) );
-
-        int fetchCount = limits.getPageSize();
-        int offset = ( limits.getSelectedPage() * limits.getPageSize() );
-
-        if ( fetchCount > results.getTotalHits() )
-        {
-            fetchCount = results.getTotalHits();
-        }
-
-        // Goto offset.
-        if ( offset < results.getTotalHits() )
-        {
-            // only process if the offset is within the hit count.
-            for ( int i = 0; i < fetchCount; i++ )
-            {
-                // Stop fetching if we are past the total # of available hits.
-                if ( offset + i >= results.getHits().size() )
-                {
-                    break;
-                }
-
-                SearchResultHit hit = results.getHits().get( ( offset + i ) );
-                if ( hit != null )
-                {
-                    String id = SearchUtil.getHitId( hit.getGroupId(), hit.getArtifactId(), hit.getClassifier(),
-                                                     hit.getPackaging() );
-                    paginated.addHit( id, hit );
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-        paginated.setTotalHits( results.getTotalHits() );
-        paginated.setReturnedHitsCount( paginated.getHits().size() );
-        paginated.setTotalHitsMapSize( results.getTotalHitsMapSize() );
-        paginated.setLimits( limits );
-
-        return paginated;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/archiva/blob/c6e4e563/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/resources/META-INF/spring-context.xml
index 8c0de11..870a13b 100644
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/resources/META-INF/spring-context.xml
@@ -22,23 +22,15 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:task="http://www.springframework.org/schema/task"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-3.0.xsd
-           http://www.springframework.org/schema/task
-            http://www.springframework.org/schema/task/spring-task-3.0.xsd"
+           http://www.springframework.org/schema/context/spring-context-3.0.xsd"
        default-lazy-init="false">
 
   <context:annotation-config/>
-  <context:component-scan base-package="org.apache.archiva.indexer.search,org.apache.archiva.indexer.merger"/>
+  <context:component-scan base-package="org.apache.archiva.indexer.maven,org.apache.maven.index"/>
 
-  <bean id="logger" class="org.apache.archiva.common.utils.Slf4JPlexusLogger">
-    <constructor-arg type="java.lang.Class">
-      <value>org.apache.maven.index.DefaultNexusIndexer</value>
-    </constructor-arg>
-  </bean>
 
   <bean name="taskScheduler#mergeRemoteIndexes"
         class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler">

http://git-wip-us.apache.org/repos/asf/archiva/blob/c6e4e563/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
new file mode 100644
index 0000000..07fcc09
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
@@ -0,0 +1,306 @@
+package org.apache.archiva.indexer.maven.search;
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+import junit.framework.TestCase;
+import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
+import org.apache.archiva.admin.repository.proxyconnector.DefaultProxyConnectorAdmin;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.utils.FileUtils;
+import org.apache.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.Configuration;
+import org.apache.archiva.configuration.ConfigurationListener;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.indexer.maven.search.MavenRepositorySearch;
+import org.apache.archiva.indexer.search.SearchResultHit;
+import org.apache.archiva.indexer.search.SearchResults;
+import org.apache.archiva.repository.RepositoryRegistry;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import org.apache.commons.lang.SystemUtils;
+import org.apache.maven.index.ArtifactContext;
+import org.apache.maven.index.ArtifactContextProducer;
+import org.apache.maven.index.ArtifactScanningListener;
+import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.QueryCreator;
+import org.apache.maven.index.ScanningResult;
+import org.apache.maven.index.context.IndexCreator;
+import org.apache.maven.index.context.IndexingContext;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.test.context.ContextConfiguration;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * @author Olivier Lamy
+ */
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+public abstract class AbstractMavenRepositorySearch
+    extends TestCase
+{
+
+    protected Logger log = LoggerFactory.getLogger( getClass() );
+
+    public static String TEST_REPO_1 = "maven-search-test-repo";
+
+    public static String TEST_REPO_2 = "maven-search-test-repo-2";
+
+
+    public static String REPO_RELEASE = "repo-release";
+
+    MavenRepositorySearch search;
+
+    ArchivaConfiguration archivaConfig;
+
+    @Inject
+    ArtifactContextProducer artifactContextProducer;
+
+    @Inject
+    RepositoryRegistry repositoryRegistry;
+
+    IMocksControl archivaConfigControl;
+
+    Configuration config;
+
+    @Inject
+    PlexusSisuBridge plexusSisuBridge;
+
+    @Inject
+    List<IndexCreator> indexCreators;
+
+    @Inject
+    NexusIndexer nexusIndexer;
+
+    @Inject
+    QueryCreator queryCreator;
+
+    @Before
+    @Override
+    public void setUp()
+        throws Exception
+    {
+        super.setUp();
+
+        FileUtils.deleteDirectory( Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_1 + "/.indexer" ) );
+        assertFalse( Files.exists(Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_1 + "/.indexer" )) );
+
+        FileUtils.deleteDirectory( Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_2 + "/.indexer" ) );
+        assertFalse( Files.exists(Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_2 + "/.indexer" )) );
+
+        archivaConfigControl = EasyMock.createControl();
+
+        archivaConfig = archivaConfigControl.createMock( ArchivaConfiguration.class );
+
+        DefaultManagedRepositoryAdmin defaultManagedRepositoryAdmin = new DefaultManagedRepositoryAdmin();
+        defaultManagedRepositoryAdmin.setArchivaConfiguration( archivaConfig );
+
+        DefaultProxyConnectorAdmin defaultProxyConnectorAdmin = new DefaultProxyConnectorAdmin();
+        defaultProxyConnectorAdmin.setArchivaConfiguration( archivaConfig );
+        repositoryRegistry.setArchivaConfiguration( archivaConfig );
+
+        search = new MavenRepositorySearch( nexusIndexer, defaultManagedRepositoryAdmin, defaultProxyConnectorAdmin,
+                                            queryCreator );
+
+        defaultManagedRepositoryAdmin.setIndexer( nexusIndexer );
+        defaultManagedRepositoryAdmin.setIndexCreators( indexCreators );
+        assertNotNull( repositoryRegistry );
+        defaultManagedRepositoryAdmin.setRepositoryRegistry( repositoryRegistry );
+
+        config = new Configuration();
+        config.addManagedRepository( createRepositoryConfig( TEST_REPO_1 ) );
+        config.addManagedRepository( createRepositoryConfig( TEST_REPO_2 ) );
+        config.addManagedRepository( createRepositoryConfig( REPO_RELEASE ) );
+
+
+        archivaConfig.addListener( EasyMock.anyObject( ConfigurationListener.class ) );
+        EasyMock.expect( archivaConfig.getDefaultLocale() ).andReturn( Locale.getDefault( ) ).anyTimes();
+        EasyMock.expect( archivaConfig.getConfiguration() ).andReturn(config).anyTimes();
+        archivaConfigControl.replay();
+        repositoryRegistry.reload();
+        archivaConfigControl.reset();
+    }
+
+    @After
+    @Override
+    public void tearDown()
+        throws Exception
+    {
+        for ( IndexingContext indexingContext : nexusIndexer.getIndexingContexts().values() )
+        {
+            nexusIndexer.removeIndexingContext( indexingContext, true );
+        }
+
+        FileUtils.deleteDirectory( Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_1 ) );
+        assertFalse( Files.exists(Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_1 )) );
+
+        FileUtils.deleteDirectory( Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_2 ) );
+        assertFalse( Files.exists(Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + TEST_REPO_2 )) );
+
+        super.tearDown();
+    }
+
+    protected ManagedRepositoryConfiguration createRepositoryConfig( String repository )
+    {
+        ManagedRepositoryConfiguration repositoryConfig = new ManagedRepositoryConfiguration();
+        repositoryConfig.setId( repository );
+        repositoryConfig.setLocation( org.apache.archiva.common.utils.FileUtils.getBasedir() + "/target/repos/" + repository );
+        Path f = Paths.get( repositoryConfig.getLocation() );
+        if ( !Files.exists(f) )
+        {
+            try
+            {
+                Files.createDirectories( f );
+            }
+            catch ( IOException e )
+            {
+                log.error("Could not create directories for {}", f);
+            }
+        }
+        repositoryConfig.setLayout( "default" );
+        repositoryConfig.setName( repository );
+        repositoryConfig.setScanned( true );
+        repositoryConfig.setSnapshots( false );
+        repositoryConfig.setReleases( true );
+
+        return repositoryConfig;
+    }
+
+    protected void createIndex( String repository, List<Path> filesToBeIndexed, boolean scan )
+        throws Exception
+    {
+
+        IndexingContext context = nexusIndexer.getIndexingContexts().get( repository );
+
+        if ( context != null )
+        {
+            nexusIndexer.removeIndexingContext( context, true );
+        }
+
+        Path indexerDirectory = Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + repository + "/.indexer" );
+
+        if ( Files.exists(indexerDirectory) )
+        {
+            FileUtils.deleteDirectory( indexerDirectory );
+        }
+
+        assertFalse( Files.exists(indexerDirectory) );
+
+        Path lockFile = Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "/target/repos/" + repository + "/.indexer/write.lock" );
+        if ( Files.exists(lockFile) )
+        {
+            Files.delete(lockFile);
+        }
+
+        assertFalse( Files.exists(lockFile) );
+
+        Path repo = Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "src/test/" + repository );
+        assertTrue( Files.exists(repo) );
+        Path indexDirectory =
+            Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "target/index/test-" + Long.toString( System.currentTimeMillis() ) );
+        indexDirectory.toFile().deleteOnExit();
+        FileUtils.deleteDirectory( indexDirectory );
+
+        context = nexusIndexer.addIndexingContext( repository, repository, repo.toFile(), indexDirectory.toFile(),
+                                                   repo.toUri().toURL().toExternalForm(),
+                                                   indexDirectory.toUri().toURL().toString(), indexCreators );
+
+        // minimize datas in memory
+//        context.getIndexWriter().setMaxBufferedDocs( -1 );
+//        context.getIndexWriter().setRAMBufferSizeMB( 1 );
+        for ( Path artifactFile : filesToBeIndexed )
+        {
+            assertTrue( "file not exists " + artifactFile, Files.exists(artifactFile) );
+            ArtifactContext ac = artifactContextProducer.getArtifactContext( context, artifactFile.toFile() );
+
+            if ( artifactFile.toString().endsWith( ".pom" ) )
+            {
+                ac.getArtifactInfo().setFileExtension( "pom" );
+                ac.getArtifactInfo().setPackaging( "pom" );
+                ac.getArtifactInfo().setClassifier( "pom" );
+            }
+            nexusIndexer.addArtifactToIndex( ac, context );
+            context.updateTimestamp( true );
+        }
+
+        if ( scan )
+        {
+            nexusIndexer.scan( context, new ArtifactScanListener(), false );
+        }
+        // force flushing
+        context.getIndexWriter().commit();
+        context.setSearchable( true );
+
+    }
+
+    static class ArtifactScanListener
+        implements ArtifactScanningListener
+    {
+        protected Logger log = LoggerFactory.getLogger( getClass() );
+
+        @Override
+        public void scanningStarted( IndexingContext ctx )
+        {
+            //
+        }
+
+        @Override
+        public void scanningFinished( IndexingContext ctx, ScanningResult result )
+        {
+            // no op
+        }
+
+        @Override
+        public void artifactError( ArtifactContext ac, Exception e )
+        {
+            log.debug( "artifactError {}", ac.getArtifact().getPath(), e );
+        }
+
+        @Override
+        public void artifactDiscovered( ArtifactContext ac )
+        {
+            log.debug( "artifactDiscovered {}:{}", //
+                       ac.getArtifact() == null ? "" : ac.getArtifact().getPath(), //
+                       ac.getArtifact() == null ? "" : ac.getArtifactInfo() );
+        }
+    }
+
+    public String niceDisplay( SearchResults searchResults )
+        throws Exception
+    {
+        StringBuilder sb = new StringBuilder();
+        for ( SearchResultHit hit : searchResults.getHits() )
+        {
+            sb.append( hit.toString() ).append( SystemUtils.LINE_SEPARATOR );
+        }
+        return sb.toString();
+    }
+}

http://git-wip-us.apache.org/repos/asf/archiva/blob/c6e4e563/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
new file mode 100644
index 0000000..e99947f
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
@@ -0,0 +1,81 @@
+package org.apache.archiva.indexer.maven.search;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.indexer.search.SearchFields;
+import org.apache.archiva.indexer.search.SearchResultHit;
+import org.apache.archiva.indexer.search.SearchResults;
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * @author Olivier Lamy
+ */
+public class MavenRepositorySearchOSGITest
+    extends AbstractMavenRepositorySearch
+{
+
+    @Test
+    public void searchFelixWithSymbolicName()
+        throws Exception
+    {
+
+        createIndex( TEST_REPO_1, Collections.<Path>emptyList(), true );
+
+        List<String> selectedRepos = Arrays.asList( TEST_REPO_1 );
+
+        // search artifactId
+        EasyMock.expect( archivaConfig.getDefaultLocale() ).andReturn( Locale.getDefault( ) ).anyTimes();
+        EasyMock.expect( archivaConfig.getConfiguration()).andReturn(config).anyTimes();
+
+        archivaConfigControl.replay();
+
+        SearchFields searchFields = new SearchFields();
+        searchFields.setBundleSymbolicName( "org.apache.felix.bundlerepository" );
+        searchFields.setBundleVersion( "1.6.6" );
+        searchFields.setRepositories( selectedRepos );
+
+        SearchResults results = search.search( "user", searchFields, null );
+
+        archivaConfigControl.verify();
+
+        assertNotNull( results );
+        assertEquals( 1, results.getTotalHits() );
+
+        SearchResultHit hit = results.getHits().get( 0 );
+        assertEquals( "org.apache.felix", hit.getGroupId() );
+        assertEquals( "org.apache.felix.bundlerepository", hit.getArtifactId() );
+        assertEquals( "1.6.6", hit.getVersions().get( 0 ) );
+
+        assertEquals( "org.apache.felix.bundlerepository;uses:=\"org.osgi.framework\";version=\"2.0\"",
+                      hit.getBundleExportPackage() );
+        assertEquals( "org.apache.felix.bundlerepository.RepositoryAdmin,org.osgi.service.obr.RepositoryAdmin",
+                      hit.getBundleExportService() );
+        assertEquals( "org.apache.felix.bundlerepository", hit.getBundleSymbolicName() );
+        assertEquals( "1.6.6", hit.getBundleVersion() );
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/archiva/blob/c6e4e563/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
new file mode 100644
index 0000000..c8498b2
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
@@ -0,0 +1,109 @@
+package org.apache.archiva.indexer.maven.search;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+import org.apache.archiva.indexer.maven.search.MavenRepositorySearch;
+import org.apache.archiva.indexer.search.SearchResultHit;
+import org.apache.archiva.indexer.search.SearchResultLimits;
+import org.apache.archiva.indexer.search.SearchResults;
+import org.apache.archiva.indexer.util.SearchUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
+
+/**
+ * @author Olivier Lamy
+ */
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
+public class MavenRepositorySearchPaginateTest
+    extends TestCase
+{
+    @Test
+    public void nonPaginatedResult()
+        throws Exception
+    {
+        MavenRepositorySearch search = new MavenRepositorySearch();
+
+        SearchResults searchResults = build( 10, new SearchResultLimits( 0 ) );
+
+        searchResults = search.paginate( searchResults );
+
+        assertEquals( 10, searchResults.getReturnedHitsCount() );
+
+    }
+
+    @Test
+    public void nonPaginatedHugeResult()
+        throws Exception
+    {
+        MavenRepositorySearch search = new MavenRepositorySearch();
+
+        SearchResults origSearchResults = build( 63, new SearchResultLimits( 0 ) );
+
+        SearchResults searchResults = search.paginate( origSearchResults );
+
+        assertEquals( 30, searchResults.getReturnedHitsCount() );
+
+        origSearchResults = build( 63, new SearchResultLimits( 1 ) );
+
+        searchResults = search.paginate( origSearchResults );
+
+        assertEquals( 30, searchResults.getReturnedHitsCount() );
+
+    }
+
+    @Test
+    public void paginatedResult()
+        throws Exception
+    {
+        MavenRepositorySearch search = new MavenRepositorySearch();
+
+        SearchResults searchResults = build( 32, new SearchResultLimits( 1 ) );
+
+        searchResults = search.paginate( searchResults );
+
+        assertEquals( 2, searchResults.getReturnedHitsCount() );
+
+    }
+
+
+    SearchResults build( int number, SearchResultLimits limits )
+    {
+        SearchResults searchResults = new SearchResults();
+        searchResults.setLimits( limits );
+        for ( int i = 0; i < number; i++ )
+        {
+            SearchResultHit hit = new SearchResultHit();
+            hit.setGroupId( "commons-foo" );
+            hit.setArtifactId( "commons-bar-" + i );
+            hit.setPackaging( "jar" );
+            hit.setVersions( Arrays.asList( "1.0" ) );
+            String id =
+                SearchUtil.getHitId( hit.getGroupId(), hit.getArtifactId(), hit.getClassifier(), hit.getPackaging() );
+            searchResults.addHit( id, hit );
+        }
+
+        searchResults.setTotalHits( number );
+        return searchResults;
+
+    }
+}


Mime
View raw message