diff --git a/java/maven.indexer/external/binaries-list b/java/maven.indexer/external/binaries-list index 79224b17ef59..02a0f1941a0f 100644 --- a/java/maven.indexer/external/binaries-list +++ b/java/maven.indexer/external/binaries-list @@ -15,9 +15,12 @@ # specific language governing permissions and limitations # under the License. C02F9C34FBC4C698BEF9D5074966545122908D06 org.apache.maven.indexer:indexer-core:7.0.2 +20AE1ED178C812FAA78DC83C9BF218D047FD01D0 org.apache.maven.indexer:search-api:7.0.2 +5967AEFBE9281C46155E73BBFC1E2BC4054CC92F org.apache.maven.indexer:search-backend-smo:7.0.2 2C08C7A491E9D033BB4806E0A45496E3A0667217 org.apache.lucene:lucene-core:9.6.0 A4819CA127C46A2759FDF091F41512C56C441FA7 org.apache.lucene:lucene-backward-codecs:9.6.0 B9E14451C73FA0BC8E71A2CFE12A442F37A53C69 org.apache.lucene:lucene-highlighter:9.6.0 C2F9EF9B7336981495272E99A1DF678A97966102 org.apache.lucene:lucene-queryparser:9.6.0 17A8B808BB7BF5F49FBFB9CBFF821433E2908E22 org.apache.lucene:lucene-analysis-common:9.6.0 479C1E06DB31C432330183F5CAE684163F186146 javax.annotation:javax.annotation-api:1.2 +B3ADD478D4382B78EA20B1671390A858002FEB6C com.google.code.gson:gson:2.10.1 diff --git a/java/maven.indexer/external/gson-2.10.1-license.txt b/java/maven.indexer/external/gson-2.10.1-license.txt new file mode 100644 index 000000000000..fa9d3887d895 --- /dev/null +++ b/java/maven.indexer/external/gson-2.10.1-license.txt @@ -0,0 +1,208 @@ +Name: GSon +Description: JSon serialization/deserialization library +Origin: GitHub +Version: 2.10.1 +License: Apache-2.0 +Source: https://github.com/google/gson + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. \ No newline at end of file diff --git a/java/maven.indexer/external/indexer-core-7.0.2-license.txt b/java/maven.indexer/external/indexer-core-7.0.2-license.txt index f42ccf52abac..b23fed39ef59 100644 --- a/java/maven.indexer/external/indexer-core-7.0.2-license.txt +++ b/java/maven.indexer/external/indexer-core-7.0.2-license.txt @@ -4,6 +4,8 @@ Version: 7.0.2 Origin: Apache Software Foundation License: Apache-2.0 URL: https://repo1.maven.org/maven2/org/apache/maven/indexer/ +Source: https://github.com/apache/maven-indexer +Files: indexer-core-7.0.2.jar search-api-7.0.2.jar search-backend-smo-7.0.2.jar Apache License Version 2.0, January 2004 diff --git a/java/maven.indexer/external/indexer-core-7.0.2-notice.txt b/java/maven.indexer/external/indexer-core-7.0.2-notice.txt index 9cabd08f6916..fe8c8455c71a 100644 --- a/java/maven.indexer/external/indexer-core-7.0.2-notice.txt +++ b/java/maven.indexer/external/indexer-core-7.0.2-notice.txt @@ -1,5 +1,5 @@ Maven :: Indexer Core -Copyright 2002-2022 The Apache Software Foundation +Copyright 2002-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties index 500ec728c322..fda5aa1a253a 100644 --- a/java/maven.indexer/nbproject/project.properties +++ b/java/maven.indexer/nbproject/project.properties @@ -21,6 +21,9 @@ javac.source=11 javac.target=11 javac.compilerargs=-Xlint -Xlint:-serial release.external/indexer-core-7.0.2.jar=modules/ext/maven/indexer-core-7.0.2.jar +release.external/search-api-7.0.2.jar=modules/ext/maven/search-api-7.0.2.jar +release.external/search-backend-smo-7.0.2.jar=modules/ext/maven/search-backend-smo-7.0.2.jar +release.external/gson-2.10.1.jar=modules/ext/maven/gson-2.10.1.jar release.external/lucene-core-9.6.0.jar=modules/ext/maven/lucene-core-9.6.0.jar release.external/lucene-backward-codecs-9.6.0.jar=modules/ext/maven/lucene-backward-codecs-9.6.0.jar release.external/lucene-highlighter-9.6.0.jar=modules/ext/maven/lucene-highlighter-9.6.0.jar diff --git a/java/maven.indexer/nbproject/project.xml b/java/maven.indexer/nbproject/project.xml index fb0e05a8a539..fc2f00355b90 100644 --- a/java/maven.indexer/nbproject/project.xml +++ b/java/maven.indexer/nbproject/project.xml @@ -178,6 +178,14 @@ ext/maven/indexer-core-7.0.2.jar external/indexer-core-7.0.2.jar + + ext/maven/search-api-7.0.2.jar + external/search-api-7.0.2.jar + + + ext/maven/search-backend-smo-7.0.2.jar + external/search-backend-smo-7.0.2.jar + ext/maven/lucene-core-9.6.0.jar external/lucene-core-9.6.0.jar @@ -202,6 +210,10 @@ ext/maven/javax.annotation-api-1.2.jar external/javax.annotation-api-1.2.jar + + ext/maven/gson-2.10.1.jar + external/gson-2.10.1.jar + diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CompositeResult.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CompositeResult.java new file mode 100644 index 000000000000..20ad96c1ec5a --- /dev/null +++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CompositeResult.java @@ -0,0 +1,85 @@ +/* + * 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. + */ +package org.netbeans.modules.maven.indexer; + +import java.util.List; +import java.util.stream.Collectors; +import org.netbeans.modules.maven.indexer.spi.ResultImplementation; + +/** + * Merged view over multiple {@link ResultImplementation}s. + * + * @author mbien + */ +final class CompositeResult implements ResultImplementation { + + private final List> results; + + public CompositeResult(List> results) { + this.results = results; + } + + public CompositeResult(ResultImplementation first, ResultImplementation second) { + this(List.of(first, second)); + } + + @Override + public boolean isPartial() { + for (ResultImplementation result : results) { + if (result.isPartial()) { + return true; + } + } + return false; + } + + @Override + public void waitForSkipped() { + for (ResultImplementation result : results) { + result.waitForSkipped(); + } + } + + @Override + public List getResults() { + return results.stream() + .flatMap(r -> r.getResults().stream()) + .distinct() + .collect(Collectors.toList()); + } + + @Override + public int getTotalResultCount() { + int ret = 0; + for (ResultImplementation result : results) { + ret += result.getTotalResultCount(); + } + return ret; + } + + @Override + public int getReturnedResultCount() { + int ret = 0; + for (ResultImplementation result : results) { + ret += result.getReturnedResultCount(); + } + return ret; + } + +} diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java index 5d1fb15450ef..a2a801dfffdc 100644 --- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java +++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java @@ -65,6 +65,11 @@ import org.apache.maven.index.updater.IndexUpdateRequest; import org.apache.maven.index.updater.IndexUpdater; import org.apache.maven.index.updater.ResourceFetcher; +import org.apache.maven.search.SearchRequest; +import org.apache.maven.search.backend.smo.SmoSearchBackend; +import org.apache.maven.search.backend.smo.SmoSearchBackendFactory; +import org.apache.maven.search.request.FieldQuery; +import org.apache.maven.search.request.Paging; import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Server; import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest; @@ -167,6 +172,8 @@ public class NexusRepositoryIndexerImpl implements RepositoryIndexerImplementati * For remote repo download and indexing tasks. */ private static final RequestProcessor RP_REMOTE = new RequestProcessor("maven-remote-indexing"); + + private final SmoSearchBackend smo = new SmoSearchBackendFactory().createDefault(); @Override public boolean handlesRepository(RepositoryInfo repo) { @@ -440,7 +447,7 @@ private boolean loadIndexingContext(final RepositoryInfo info) throws IOExceptio try { IndexSearcher.setMaxClauseCount(max); response = searcher.searchIteratorPaged(isr, contexts); - LOGGER.log(Level.FINE, "passed on {0} clauses processing {1} with {2} hits", new Object[] {max, q, response.getTotalHitsCount()}); + LOGGER.log(Level.INFO, "passed on {0} clauses processing {1} with {2} hits", new Object[] {max, q, response.getTotalHitsCount()}); return response; } catch (IndexSearcher.TooManyClauses exc) { LOGGER.log(Level.FINE, "TooManyClauses on {0} clauses processing {1}", new Object[] {max, q}); @@ -1196,12 +1203,30 @@ private ResultImplementation getVersions(final String groupId, fi @Override public ResultImplementation findVersionsByClass(final String className, List repos) { - ResultImpl result = new ResultImpl<>((ResultImpl result1) -> { - findVersionsByClass(className, result1, result1.getSkipped(), false); - }); - return findVersionsByClass(className, result, repos, true); + + Optional central = repos.stream() + .filter(repo -> repo.getId().equals(smo.getRepositoryId())) + .findFirst(); + + // remote index contains no class data -> use web service + if (central.isPresent()) { + List otherRepos = new ArrayList<>(repos); + otherRepos.remove(central.get()); + + SearchRequest request = new SearchRequest(new Paging(128), + FieldQuery.fieldQuery(className.contains(".") ? + org.apache.maven.search.MAVEN.FQ_CLASS_NAME + : org.apache.maven.search.MAVEN.CLASS_NAME, className)); + + return new CompositeResult<>(findVersionsByClass(className, otherRepos), new SMORequestResult(smo, request)); + } else { + ResultImpl result = new ResultImpl<>((ResultImpl result1) -> { + findVersionsByClass(className, result1, result1.getSkipped(), false); + }); + return findVersionsByClass(className, result, repos, true); + } } - + 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); @@ -1345,14 +1370,28 @@ private static void convertToNBGroupInfo(Collection artifactInfos } } - - @Override public ResultImplementation findBySHA1(final String sha1, List repos) { - ResultImpl result = new ResultImpl<>((ResultImpl result1) -> { - findBySHA1(sha1, result1, result1.getSkipped(), false); - }); - return findBySHA1(sha1, result, repos, true); + + Optional central = repos.stream() + .filter(repo -> repo.getId().equals(smo.getRepositoryId())) + .findFirst(); + + // remote index contains no sh1 data -> use web service + if (central.isPresent()) { + List otherRepos = new ArrayList<>(repos); + otherRepos.remove(central.get()); + + SearchRequest request = new SearchRequest(new Paging(8), + FieldQuery.fieldQuery(org.apache.maven.search.MAVEN.SHA1, sha1)); + + return new CompositeResult<>(findBySHA1(sha1, otherRepos), new SMORequestResult(smo, request)); + } else { + ResultImpl result = new ResultImpl<>((ResultImpl result1) -> { + findBySHA1(sha1, result1, result1.getSkipped(), false); + }); + return findBySHA1(sha1, result, repos, true); + } } private ResultImplementation findBySHA1(final String sha1, final ResultImpl result, List repos, final boolean skipUnIndexed) { diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/SMORequestResult.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/SMORequestResult.java new file mode 100644 index 000000000000..bd5a7c27fc64 --- /dev/null +++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/SMORequestResult.java @@ -0,0 +1,114 @@ +/* + * 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. + */ +package org.netbeans.modules.maven.indexer; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import org.apache.maven.search.MAVEN; +import org.apache.maven.search.SearchRequest; +import org.apache.maven.search.backend.smo.SmoSearchBackend; +import org.apache.maven.search.backend.smo.SmoSearchResponse; +import org.netbeans.modules.maven.indexer.api.NBVersionInfo; +import org.netbeans.modules.maven.indexer.spi.ResultImplementation; +import org.openide.util.Exceptions; + +/** + * Wraps search-maven-org query results and handles pagination. + * + * @author mbien + */ +final class SMORequestResult implements ResultImplementation { + + // if we paginate too much we will get 504 responses + private static final int MAX_PAGES = 10; + + private final SmoSearchBackend smo; + private SmoSearchResponse response; + + private List list; + + public SMORequestResult(SmoSearchBackend smo, SearchRequest request) { + this.smo = smo; + try { + this.response = smo.search(request); + this.list = null; + } catch (IOException ex) { + this.response = null; + this.list = Collections.emptyList(); + } + } + + @Override + public List getResults() { + if (list == null) { + list = response.getPage().stream() + .map(rec -> new NBVersionInfo( + smo.getRepositoryId(), + rec.getValue(MAVEN.GROUP_ID), + rec.getValue(MAVEN.ARTIFACT_ID), + rec.getValue(MAVEN.VERSION), + rec.getValue(MAVEN.PACKAGING), // todo, type is used in the UI as packaging?? + rec.getValue(MAVEN.PACKAGING), + null, + null, + rec.getValue(MAVEN.CLASSIFIER))) + .collect(Collectors.toList()); + } + return list; + } + + @Override + public void waitForSkipped() { + if (!isPartial()) { + return; + } + List fullList = new ArrayList<>(getResults()); + int page = 0; + while (isPartial() && page++ < MAX_PAGES) { + list = null; + try { + response = smo.search(response.getSearchRequest().nextPage()); + fullList.addAll(getResults()); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + break; + } + } + list = Collections.unmodifiableList(fullList); + } + + @Override + public boolean isPartial() { + return response != null && response.getTotalHits() > response.getCurrentHits(); + } + + @Override + public int getTotalResultCount() { + return response == null ? 0 : response.getTotalHits(); + } + + @Override + public int getReturnedResultCount() { + return response == null ? 0 : response.getCurrentHits(); + } + +}