From f48d71800f1a9e04977a710789b018f95a58d6be Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 5 Jan 2012 07:52:48 +0000 Subject: [PATCH] fix typo (filer -> filter) git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1227518 13f79535-47bb-0310-9956-ffa450edef68 --- ...actInfoFiler.java => ArtifactInfoFilter.java} | 2 +- .../indexer/search/NexusRepositorySearch.java | 16 ++++++++-------- ....java => NoClassifierArtifactInfoFilter.java} | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) rename archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/{ArtifactInfoFiler.java => ArtifactInfoFilter.java} (96%) rename archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/{NoClassifierArtifactInfoFiler.java => NoClassifierArtifactInfoFilter.java} (81%) diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFiler.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFilter.java similarity index 96% rename from archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFiler.java rename to archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFilter.java index e9f217faf..cecb8c8bf 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFiler.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFilter.java @@ -26,7 +26,7 @@ import java.util.Map; * @author Olivier Lamy * @since 1.4-M1 */ -public interface ArtifactInfoFiler +public interface ArtifactInfoFilter { boolean addArtifactInResult( ArtifactInfo artifact, Map currentResult ); } diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java index 81b76ee5f..436e9df2e 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java @@ -124,7 +124,7 @@ public class NexusRepositorySearch // 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, NoClassifierArtifactInfoFiler.LIST, selectedRepos, false ); + return search( limits, q, indexingContextIds, NoClassifierArtifactInfoFilter.LIST, selectedRepos, false ); } @@ -235,12 +235,12 @@ public class NexusRepositorySearch throw new RepositorySearchException( "No search fields set." ); } - return search( limits, q, indexingContextIds, Collections.emptyList(), + return search( limits, q, indexingContextIds, Collections.emptyList(), searchFields.getRepositories(), searchFields.isIncludePomArtifacts() ); } private SearchResults search( SearchResultLimits limits, BooleanQuery q, List indexingContextIds, - List filters, + List filters, List selectedRepos, boolean includePoms) throws RepositorySearchException { @@ -448,7 +448,7 @@ public class NexusRepositorySearch private SearchResults convertToSearchResults( FlatSearchResponse response, SearchResultLimits limits, - List artifactInfoFilers, + List artifactInfoFilters, ListselectedRepos, boolean includePoms) throws RepositoryAdminException { @@ -465,7 +465,7 @@ public class NexusRepositorySearch artifactInfo.packaging ); Map hitsMap = results.getHitsMap(); - if ( !applyArtifactInfoFilters( artifactInfo, artifactInfoFilers, hitsMap ) ) + if ( !applyArtifactInfoFilters( artifactInfo, artifactInfoFilters, hitsMap ) ) { continue; } @@ -620,15 +620,15 @@ public class NexusRepositorySearch } private boolean applyArtifactInfoFilters( ArtifactInfo artifactInfo, - List artifactInfoFilers, + List artifactInfoFilters, Map currentResult ) { - if ( artifactInfoFilers == null || artifactInfoFilers.isEmpty() ) + if ( artifactInfoFilters == null || artifactInfoFilters.isEmpty() ) { return true; } - for ( ArtifactInfoFiler filter : artifactInfoFilers ) + for ( ArtifactInfoFilter filter : artifactInfoFilters ) { if ( !filter.addArtifactInResult( artifactInfo, currentResult ) ) { diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFiler.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFilter.java similarity index 81% rename from archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFiler.java rename to archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFilter.java index 078970299..d34f0b7ad 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFiler.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NoClassifierArtifactInfoFilter.java @@ -28,12 +28,12 @@ import java.util.Map; /** * @author Olivier Lamy */ -public class NoClassifierArtifactInfoFiler - implements ArtifactInfoFiler +public class NoClassifierArtifactInfoFilter + implements ArtifactInfoFilter { - public static final NoClassifierArtifactInfoFiler INSTANCE = new NoClassifierArtifactInfoFiler(); + public static final NoClassifierArtifactInfoFilter INSTANCE = new NoClassifierArtifactInfoFilter(); - public static final List LIST = Arrays.asList( INSTANCE ); + public static final List LIST = Arrays.asList( INSTANCE ); public boolean addArtifactInResult( ArtifactInfo artifact, Map currentResult ) { -- 2.39.5