# NetBeans IDE HG Patch
# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /work/src/netbeans-jm
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: maven.indexer/manifest.mf
--- maven.indexer/manifest.mf
+++ maven.indexer/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/indexer/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.37
+OpenIDE-Module-Specification-Version: 2.38
OpenIDE-Module: org.netbeans.modules.maven.indexer/2
Index: maven.indexer/nbproject/project.xml
--- maven.indexer/nbproject/project.xml
+++ maven.indexer/nbproject/project.xml
@@ -168,6 +168,7 @@
org.netbeans.modules.maven.refactoring
org.netbeans.modules.maven.repository
org.netbeans.modules.maven.search
+ ro.emilianbold.modules.maven.search.remote
org.apache.lucene
org.apache.lucene.analysis
org.apache.lucene.analysis.standard
@@ -185,8 +186,7 @@
org.apache.lucene.util
org.apache.lucene.util.cache
org.netbeans.modules.maven.indexer.api
- org.netbeans.modules.maven.indexer.api.ui
- org.netbeans.modules.maven.indexer.spi.ui
+ org.netbeans.modules.maven.indexer.spi
org.netbeans.modules.maven.indexer.spi.impl
Index: maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
--- maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
+++ maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -102,7 +102,6 @@
import org.codehaus.plexus.util.FileUtils;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NullAllowed;
-import org.netbeans.api.annotations.common.SuppressWarnings;
import org.netbeans.modules.maven.embedder.EmbedderFactory;
import org.netbeans.modules.maven.embedder.MavenEmbedder;
import org.netbeans.modules.maven.indexer.api.NBArtifactInfo;
@@ -111,7 +110,6 @@
import org.netbeans.modules.maven.indexer.api.QueryField;
import org.netbeans.modules.maven.indexer.api.RepositoryInfo;
import org.netbeans.modules.maven.indexer.api.RepositoryPreferences;
-import org.netbeans.modules.maven.indexer.api.RepositoryQueries.Result;
import org.netbeans.modules.maven.indexer.spi.ArchetypeQueries;
import org.netbeans.modules.maven.indexer.spi.BaseQueries;
import org.netbeans.modules.maven.indexer.spi.ChecksumQueries;
@@ -120,8 +118,9 @@
import org.netbeans.modules.maven.indexer.spi.ContextLoadedQuery;
import org.netbeans.modules.maven.indexer.spi.DependencyInfoQueries;
import org.netbeans.modules.maven.indexer.spi.GenericFindQuery;
-import org.netbeans.modules.maven.indexer.spi.Redo;
-import org.netbeans.modules.maven.indexer.spi.RepositoryIndexerImplementation;
+import org.netbeans.modules.maven.indexer.spi.impl.RepositoryIndexerImplementation;
+import org.netbeans.modules.maven.indexer.spi.ResultImplementation;
+import org.netbeans.modules.maven.indexer.spi.impl.Redo;
import org.netbeans.modules.maven.indexer.spi.impl.IndexingNotificationProvider;
import org.openide.modules.Places;
import org.openide.util.BaseUtilities;
@@ -133,59 +132,16 @@
import org.openide.util.lookup.ServiceProvider;
import org.openide.util.lookup.ServiceProviders;
import org.openide.util.NbBundle.Messages;
+import org.netbeans.modules.maven.indexer.spi.RepositoryIndexQueryProvider;
@ServiceProviders({
@ServiceProvider(service=RepositoryIndexerImplementation.class),
- @ServiceProvider(service=BaseQueries.class),
- @ServiceProvider(service=ChecksumQueries.class),
- @ServiceProvider(service=ArchetypeQueries.class),
- @ServiceProvider(service=DependencyInfoQueries.class),
- @ServiceProvider(service=ClassesQuery.class),
- @ServiceProvider(service=ClassUsageQuery.class),
- @ServiceProvider(service=GenericFindQuery.class),
- @ServiceProvider(service=ContextLoadedQuery.class)
+ @ServiceProvider(service=RepositoryIndexQueryProvider.class, position = Integer.MAX_VALUE)
})
-public class NexusRepositoryIndexerImpl implements RepositoryIndexerImplementation,
+public class NexusRepositoryIndexerImpl implements RepositoryIndexerImplementation, RepositoryIndexQueryProvider,
BaseQueries, ChecksumQueries, ArchetypeQueries, DependencyInfoQueries,
ClassesQuery, ClassUsageQuery, GenericFindQuery, ContextLoadedQuery {
-
- public static abstract class Accessor {
-
- @SuppressWarnings("MS_SHOULD_BE_FINAL")
- public static Accessor ACCESSOR;
-
- protected Accessor() {
- ACCESSOR = this;
- }
-
- public abstract void addSkipped(Result> result, Collection infos);
-
- public abstract List getSkipped(Result> result);
-
- public abstract void setStringResults(Result result, Collection newResults);
-
- public abstract void setVersionResults(Result result, Collection newResults);
-
- public abstract void addSkipped(Result> result, RepositoryInfo info);
-
- public abstract Result createStringResult(Redo redo);
-
- public abstract Result createVersionResult(Redo redo);
-
- public abstract Result createGroupResult(Redo redo);
-
- public abstract void setGroupResults(Result result, Collection newResults);
-
- public abstract Result createClassResult(Redo redo);
-
- public abstract void setClassResults(Result result, Collection newResults);
-
- public abstract void addTotalResults(Result> result, int moreResults);
-
- public abstract void addReturnedResults(Result> result, int moreResults);
- }
-
private static final Logger LOGGER = Logger.getLogger(NexusRepositoryIndexerImpl.class.getName());
static {
@@ -216,6 +172,53 @@
private static final Set indexingMutexes = new HashSet();
private static final RequestProcessor RP = new RequestProcessor("indexing", 1);
+ @Override
+ public boolean handlesRepository(RepositoryInfo repo) {
+ // should always come as last when looked up
+ // handles all remote repos
+ return true;
+ }
+
+ @Override
+ public BaseQueries getBaseQueries() {
+ return this;
+ }
+
+ @Override
+ public ChecksumQueries getChecksumQueries() {
+ return this;
+ }
+
+ @Override
+ public ArchetypeQueries getArchetypeQueries() {
+ return this;
+ }
+
+ @Override
+ public DependencyInfoQueries getDependencyInfoQueries() {
+ return this;
+ }
+
+ @Override
+ public ClassesQuery getClassesQuery() {
+ return this;
+ }
+
+ @Override
+ public ClassUsageQuery getClassUsageQuery() {
+ return this;
+ }
+
+ @Override
+ public GenericFindQuery getGenericFindQuery() {
+ return this;
+ }
+
+ @Override
+ public ContextLoadedQuery getContextLoadedQuery() {
+ return this;
+ }
+
private Mutex getRepoMutex(RepositoryInfo repo) {
return getRepoMutex(repo.getId());
}
@@ -914,7 +917,7 @@
}
@Override
- public RepositoryQueries.Result getGroups(List repos) {
+ public ResultImplementation getGroups(List repos) {
return filterGroupIds("", repos);
}
@@ -971,18 +974,18 @@
}
}
+ private ResultImplementation filterGroupIds(final String prefix, final List repos) {
+ Redo redo = new Redo() {
@Override
- public RepositoryQueries.Result filterGroupIds(final String prefix, final List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createStringResult(new Redo() {
- @Override
- public void run(Result result) {
- filterGroupIds(prefix, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ filterGroupIds(prefix, result, result.getSkipped(), false);
}
- });
+ };
+ ResultImpl result = new ResultImpl(redo);
return filterGroupIds(prefix, result, repos, true);
}
- private RepositoryQueries.Result filterGroupIds(final String prefix, final RepositoryQueries.Result result,
+ private ResultImplementation filterGroupIds(final String prefix, final ResultImpl result,
final List repos, final boolean skipUnIndexed) {
final Set groups = new TreeSet(result.getResults());
final List slowCheck = new ArrayList();
@@ -1025,22 +1028,22 @@
// }
// }, skipAction, skipUnIndexed);
- Accessor.ACCESSOR.setStringResults(result, groups);
+ result.setResults(groups);
return result;
}
@Override
- public Result getGAVsForPackaging(final String packaging, List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createStringResult(new Redo() {
+ public ResultImplementation getGAVsForPackaging(final String packaging, List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- getGAVsForPackaging(packaging, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ getGAVsForPackaging(packaging, result, result.getSkipped(), false);
}
});
return getGAVsForPackaging(packaging,result, repos, true);
}
- private Result getGAVsForPackaging(final String packaging, final Result result,
+ private ResultImplementation getGAVsForPackaging(final String packaging, final ResultImpl result,
List repos, final boolean skipUnIndexed) {
final List infos = new ArrayList(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
@@ -1058,30 +1061,29 @@
}
}
} finally {
- Accessor.ACCESSOR.addReturnedResults(result, response.getTotalProcessedArtifactInfoCount());
- Accessor.ACCESSOR.addTotalResults(result, response.getTotalHitsCount());
+ result.addReturnedResultCount(response.getTotalProcessedArtifactInfoCount());
+ result.addTotalResultCount(response.getTotalHitsCount());
response.close();
}
}
}
}, skipAction, skipUnIndexed);
- Accessor.ACCESSOR.setStringResults(result, infos);
+ result.setResults(infos);
return result;
}
-
@Override
- public Result getRecords(final String groupId, final String artifactId, final String version, List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createVersionResult(new Redo() {
+ public ResultImplementation getRecords(final String groupId, final String artifactId, final String version, List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- getRecords(groupId, artifactId, version, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ getRecords(groupId, artifactId, version, result, result.getSkipped(), false);
}
});
return getRecords(groupId, artifactId, version, result, repos, true);
}
- private Result getRecords(final String groupId, final String artifactId, final String version, final Result result,
+ private ResultImplementation getRecords(final String groupId, final String artifactId, final String version, final ResultImpl result,
List repos, final boolean skipUnIndexed) {
final List infos = new ArrayList(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
@@ -1097,30 +1099,30 @@
infos.add(convertToNBVersionInfo(ai));
}
} finally {
- Accessor.ACCESSOR.addReturnedResults(result, response.getTotalProcessedArtifactInfoCount());
- Accessor.ACCESSOR.addTotalResults(result, response.getTotalHitsCount());
+ result.addReturnedResultCount(response.getTotalProcessedArtifactInfoCount());
+ result.addTotalResultCount(response.getTotalHitsCount());
response.close();
}
}
}
}, skipAction, skipUnIndexed);
doSortIssue226100(infos);
- Accessor.ACCESSOR.setVersionResults(result, infos);
+ result.setResults(infos);
return result;
}
@Override
- public RepositoryQueries.Result getArtifacts(final String groupId, final List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createStringResult(new Redo() {
+ public ResultImplementation getArtifacts(final String groupId, final List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- getArtifacts(groupId, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ getArtifacts(groupId, result, result.getSkipped(), false);
}
});
return getArtifacts(groupId, result, repos, true);
}
- private RepositoryQueries.Result getArtifacts(final String groupId, final Result result, final List repos, final boolean skipUnIndexed) {
+ private ResultImplementation getArtifacts(final String groupId, final ResultImpl result, final List repos, final boolean skipUnIndexed) {
final Set artifacts = new TreeSet(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
iterate(repos, new RepoAction() {
@@ -1141,21 +1143,21 @@
}
}
}, skipAction, skipUnIndexed);
- Accessor.ACCESSOR.setStringResults(result, artifacts);
+ result.setResults(artifacts);
return result;
}
@Override
- public RepositoryQueries.Result getVersions(final String groupId, final String artifactId, List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createVersionResult(new Redo() {
+ public ResultImplementation getVersions(final String groupId, final String artifactId, List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- getVersions(groupId, artifactId, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ getVersions(groupId, artifactId, result, result.getSkipped(), false);
}
});
return getVersions(groupId, artifactId, result, repos, true);
}
- private RepositoryQueries.Result getVersions(final String groupId, final String artifactId, final Result result, List repos, final boolean skipUnIndexed) {
+ private ResultImplementation getVersions(final String groupId, final String artifactId, final ResultImpl result, List repos, final boolean skipUnIndexed) {
final List infos = new ArrayList(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
iterate(repos, new RepoAction() {
@@ -1170,30 +1172,30 @@
infos.add(convertToNBVersionInfo(ai));
}
} finally {
- Accessor.ACCESSOR.addReturnedResults(result, response.getTotalProcessedArtifactInfoCount());
- Accessor.ACCESSOR.addTotalResults(result, response.getTotalHitsCount());
+ result.addReturnedResultCount(response.getTotalProcessedArtifactInfoCount());
+ result.addTotalResultCount(response.getTotalHitsCount());
response.close();
}
}
}
}, skipAction, skipUnIndexed);
doSortIssue226100(infos);
- Accessor.ACCESSOR.setVersionResults(result, infos);
+ result.setResults(infos);
return result;
}
@Override
- public RepositoryQueries.Result findVersionsByClass(final String className, List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createVersionResult(new Redo() {
+ public ResultImplementation findVersionsByClass(final String className, List repos) {
+ ResultImpl result = new ResultImpl(new Redo() {
@Override
- public void run(Result result) {
- findVersionsByClass(className, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ findVersionsByClass(className, result, result.getSkipped(), false);
}
});
return findVersionsByClass(className, result, repos, true);
}
- private RepositoryQueries.Result findVersionsByClass(final String className, final Result result, List repos, final boolean skipUnIndexed) {
+ private ResultImplementation findVersionsByClass(final String className, final ResultImpl result, List repos, final boolean skipUnIndexed) {
final List infos = new ArrayList(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
iterate(repos, new RepoAction() {
@@ -1215,31 +1217,31 @@
infos.addAll(postProcessClasses(response.getResults(), clsname));
} finally {
//?? really count in this case?
- Accessor.ACCESSOR.addReturnedResults(result, response.getTotalProcessedArtifactInfoCount());
- Accessor.ACCESSOR.addTotalResults(result, response.getTotalHitsCount());
+ result.addReturnedResultCount(response.getTotalProcessedArtifactInfoCount());
+ result.addTotalResultCount(response.getTotalHitsCount());
response.close();
}
}
}
}, skipAction, skipUnIndexed);
doSortIssue226100(infos);
- Accessor.ACCESSOR.setVersionResults(result, infos);
+ result.setResults(infos);
return result;
}
@Override
- public RepositoryQueries.Result findClassUsages(final String className, @NullAllowed List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createClassResult(new Redo() {
+ public ResultImplementation findClassUsages(final String className, @NullAllowed List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- findClassUsages(className, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ findClassUsages(className, result, result.getSkipped(), false);
}
});
return findClassUsages(className, result, repos, true);
}
- private RepositoryQueries.Result findClassUsages(final String className, Result result, @NullAllowed List repos, final boolean skipUnIndexed) {
+ private ResultImplementation findClassUsages(final String className, ResultImpl result, @NullAllowed List repos, final boolean skipUnIndexed) {
List localRepos = new ArrayList();
if (repos == null) {
repos = RepositoryPreferences.getInstance().getRepositoryInfos();
@@ -1261,21 +1263,21 @@
return r1.getArtifact().compareTo(r2.getArtifact());
}
});
- Accessor.ACCESSOR.setClassResults(result, results);
+ result.setResults(results);
return result;
}
@Override
- public RepositoryQueries.Result findDependencyUsage(final String groupId, final String artifactId, final String version, @NullAllowed List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createVersionResult(new Redo() {
+ public ResultImplementation findDependencyUsage(final String groupId, final String artifactId, final String version, @NullAllowed List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- findDependencyUsage(groupId, artifactId, version, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ findDependencyUsage(groupId, artifactId, version, result, result.getSkipped(), false);
}
});
return findDependencyUsage(groupId, artifactId, version, result, repos, true);
}
- private RepositoryQueries.Result findDependencyUsage(String groupId, String artifactId, String version, final Result result, @NullAllowed List repos, final boolean skipUnIndexed) {
+ private ResultImplementation findDependencyUsage(String groupId, String artifactId, String version, final ResultImpl result, @NullAllowed List repos, final boolean skipUnIndexed) {
final Query q = ArtifactDependencyIndexCreator.query(groupId, artifactId, version);
final List infos = new ArrayList(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
@@ -1288,37 +1290,37 @@
infos.add(convertToNBVersionInfo(ai));
}
} finally {
- Accessor.ACCESSOR.addReturnedResults(result, response.getTotalProcessedArtifactInfoCount());
- Accessor.ACCESSOR.addTotalResults(result, response.getTotalHitsCount());
+ result.addReturnedResultCount(response.getTotalProcessedArtifactInfoCount());
+ result.addTotalResultCount(response.getTotalHitsCount());
response.close();
}
}
}
}, skipAction, skipUnIndexed);
- Accessor.ACCESSOR.setVersionResults(result, infos);
+ result.setResults(infos);
return result;
}
@Override
- public Result findDependencyUsageGroups(final String groupId, final String artifactId, final String version, List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createGroupResult(new Redo() {
+ public ResultImplementation findDependencyUsageGroups(final String groupId, final String artifactId, final String version, List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- findDependencyUsageGroups(groupId, artifactId, version, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ findDependencyUsageGroups(groupId, artifactId, version, result, result.getSkipped(), false);
}
});
return findDependencyUsageGroups(groupId, artifactId, version, result, repos, true);
}
- private Result findDependencyUsageGroups(String groupId, String artifactId, String version, Result result, List repos, final boolean skipUnIndexed) {
+ private ResultImplementation findDependencyUsageGroups(String groupId, String artifactId, String version, ResultImpl result, List repos, final boolean skipUnIndexed) {
//tempmaps
Map groupMap = new HashMap();
Map artifactMap = new HashMap();
List groupInfos = new ArrayList(result.getResults());
- Result res = Accessor.ACCESSOR.createVersionResult(new Redo() {
+ ResultImpl res = new ResultImpl(new Redo() {
@Override
- public void run(Result result) {
+ public void run(ResultImpl result) {
//noop will not be called
}
});
@@ -1326,9 +1328,9 @@
convertToNBGroupInfo(res.getResults(),
groupMap, artifactMap, groupInfos);
if (res.isPartial()) {
- Accessor.ACCESSOR.addSkipped(result, Accessor.ACCESSOR.getSkipped(res));
+ result.addSkipped(res.getSkipped());
}
- Accessor.ACCESSOR.setGroupResults(result, groupInfos);
+ result.setResults(groupInfos);
return result;
}
@@ -1360,17 +1362,17 @@
@Override
- public RepositoryQueries.Result findBySHA1(final String sha1, List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createVersionResult(new Redo() {
+ public ResultImplementation findBySHA1(final String sha1, List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- findBySHA1(sha1, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ findBySHA1(sha1, result, result.getSkipped(), false);
}
});
return findBySHA1(sha1, result, repos, true);
}
- private RepositoryQueries.Result findBySHA1(final String sha1, final Result result, List repos, final boolean skipUnIndexed) {
+ private ResultImplementation findBySHA1(final String sha1, final ResultImpl result, List repos, final boolean skipUnIndexed) {
final List infos = new ArrayList(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
iterate(repos, new RepoAction() {
@@ -1384,30 +1386,30 @@
infos.add(convertToNBVersionInfo(ai));
}
} finally {
- Accessor.ACCESSOR.addReturnedResults(result, response.getTotalProcessedArtifactInfoCount());
- Accessor.ACCESSOR.addTotalResults(result, response.getTotalHitsCount());
+ result.addReturnedResultCount(response.getTotalProcessedArtifactInfoCount());
+ result.addTotalResultCount(response.getTotalHitsCount());
response.close();
}
}
}
}, skipAction, skipUnIndexed);
doSortIssue226100(infos);
- Accessor.ACCESSOR.setVersionResults(result, infos);
+ result.setResults(infos);
return result;
}
@Override
- public RepositoryQueries.Result findArchetypes(List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createVersionResult(new Redo() {
+ public ResultImplementation findArchetypes(List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- findArchetypes( result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ findArchetypes( result, result.getSkipped(), false);
}
});
return findArchetypes( result, repos, true);
}
- private RepositoryQueries.Result findArchetypes(final Result result, List repos, final boolean skipUnIndexed) {
+ private ResultImplementation findArchetypes(final ResultImpl result, List repos, final boolean skipUnIndexed) {
final List infos = new ArrayList(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
iterate(repos, new RepoAction() {
@@ -1426,30 +1428,30 @@
infos.add(convertToNBVersionInfo(ai));
}
} finally {
- Accessor.ACCESSOR.addReturnedResults(result, response.getTotalProcessedArtifactInfoCount());
- Accessor.ACCESSOR.addTotalResults(result, response.getTotalHitsCount());
+ result.addReturnedResultCount(response.getTotalProcessedArtifactInfoCount());
+ result.addTotalResultCount(response.getTotalHitsCount());
response.close();
}
}
}
}, skipAction, skipUnIndexed);
doSortIssue226100(infos);
- Accessor.ACCESSOR.setVersionResults(result, infos);
+ result.setResults(infos);
return result;
}
@Override
- public RepositoryQueries.Result filterPluginArtifactIds(final String groupId, final String prefix, List repos) {
- RepositoryQueries.Result result = Accessor.ACCESSOR.createStringResult(new Redo() {
+ public ResultImplementation filterPluginArtifactIds(final String groupId, final String prefix, List repos) {
+ ResultImpl result = new ResultImpl<>(new Redo() {
@Override
- public void run(Result result) {
- filterPluginArtifactIds(groupId, prefix, result, Accessor.ACCESSOR.getSkipped(result), false);
+ public void run(ResultImpl result) {
+ filterPluginArtifactIds(groupId, prefix, result, result.getSkipped(), false);
}
});
return filterPluginArtifactIds(groupId, prefix, result, repos, true);
}
- private RepositoryQueries.Result filterPluginArtifactIds(final String groupId, final String prefix, Result result, List repos, final boolean skipUnIndexed) {
+ private ResultImplementation filterPluginArtifactIds(final String groupId, final String prefix, ResultImpl result, List repos, final boolean skipUnIndexed) {
final Set artifacts = new TreeSet(result.getResults());
final SkippedAction skipAction = new SkippedAction(result);
iterate(repos, new RepoAction() {
@@ -1471,22 +1473,22 @@
}
}
}, skipAction, skipUnIndexed);
- Accessor.ACCESSOR.setStringResults(result, artifacts);
+ result.setResults(artifacts);
return result;
}
@Override
- public RepositoryQueries.Result filterPluginGroupIds(final String prefix, List repos) {
- RepositoryQueries.Result