[MINDEXER-202] Reshuffle packages (#333)

Rework, package changes in Search API to not share packages. --- https://issues.apache.org/jira/browse/MINDEXER-202
apache · Oct 25, 2023 · ee91856 · ee91856
1 parent 34e3b46
commit ee91856
Show file tree

Hide file tree

Showing 39 changed files with 106 additions and 103 deletions.
diff --git a/pom.xml b/pom.xml
@@ -369,6 +369,8 @@ under the License.
                 <exclude>src/test/**/*.txt</exclude>
                 <exclude>src/test/**/*.filename</exclude>
                 <exclude>src/test/**/.placeholder</exclude>
+                <!-- RAT is incapable to digest this -->
+                <exclude>**/module-info.java</exclude>
               </excludes>
             </configuration>
           </execution>

diff --git a/...n/java/org/apache/maven/search/MAVEN.java → ...va/org/apache/maven/search/api/MAVEN.java b/...n/java/org/apache/maven/search/MAVEN.java → ...va/org/apache/maven/search/api/MAVEN.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search;
+package org.apache.maven.search.api;
 
-import org.apache.maven.search.request.Field.BooleanField;
-import org.apache.maven.search.request.Field.NumberField;
-import org.apache.maven.search.request.Field.StringField;
+import org.apache.maven.search.api.request.Field.BooleanField;
+import org.apache.maven.search.api.request.Field.NumberField;
+import org.apache.maven.search.api.request.Field.StringField;
 
 /**
  * The ontology of Apache Maven related fields.

diff --git a/.../java/org/apache/maven/search/Record.java → ...a/org/apache/maven/search/api/Record.java b/.../java/org/apache/maven/search/Record.java → ...a/org/apache/maven/search/api/Record.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search;
+package org.apache.maven.search.api;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.maven.search.request.Field;
+import org.apache.maven.search.api.request.Field;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...rg/apache/maven/search/SearchBackend.java → ...pache/maven/search/api/SearchBackend.java b/...rg/apache/maven/search/SearchBackend.java → ...pache/maven/search/api/SearchBackend.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search;
+package org.apache.maven.search.api;
 
 import java.io.Closeable;
 

diff --git a/...org/apache/maven/search/SearchEngine.java → ...apache/maven/search/api/SearchEngine.java b/...org/apache/maven/search/SearchEngine.java → ...apache/maven/search/api/SearchEngine.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search;
+package org.apache.maven.search.api;
 
 import java.io.IOException;
 

diff --git a/...rg/apache/maven/search/SearchRequest.java → ...pache/maven/search/api/SearchRequest.java b/...rg/apache/maven/search/SearchRequest.java → ...pache/maven/search/api/SearchRequest.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search;
+package org.apache.maven.search.api;
 
-import org.apache.maven.search.request.Paging;
-import org.apache.maven.search.request.Query;
+import org.apache.maven.search.api.request.Paging;
+import org.apache.maven.search.api.request.Query;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...g/apache/maven/search/SearchResponse.java → ...ache/maven/search/api/SearchResponse.java b/...g/apache/maven/search/SearchResponse.java → ...ache/maven/search/api/SearchResponse.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search;
+package org.apache.maven.search.api;
 
 import java.util.List;
 

diff --git a/...he/maven/search/request/BooleanQuery.java → ...aven/search/api/request/BooleanQuery.java b/...he/maven/search/request/BooleanQuery.java → ...aven/search/api/request/BooleanQuery.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.request;
+package org.apache.maven.search.api.request;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...rg/apache/maven/search/request/Field.java → ...pache/maven/search/api/request/Field.java b/...rg/apache/maven/search/request/Field.java → ...pache/maven/search/api/request/Field.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.request;
+package org.apache.maven.search.api.request;
 
 import java.time.Instant;
 import java.util.Map;

diff --git a/...ache/maven/search/request/FieldQuery.java → .../maven/search/api/request/FieldQuery.java b/...ache/maven/search/request/FieldQuery.java → .../maven/search/api/request/FieldQuery.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.request;
+package org.apache.maven.search.api.request;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...g/apache/maven/search/request/Paging.java → ...ache/maven/search/api/request/Paging.java b/...g/apache/maven/search/request/Paging.java → ...ache/maven/search/api/request/Paging.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.request;
+package org.apache.maven.search.api.request;
 
 /**
  * Paging.

diff --git a/...rg/apache/maven/search/request/Query.java → ...pache/maven/search/api/request/Query.java b/...rg/apache/maven/search/request/Query.java → ...pache/maven/search/api/request/Query.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.request;
+package org.apache.maven.search.api.request;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/.../search/support/SearchBackendSupport.java → ...rch/api/support/SearchBackendSupport.java b/.../search/support/SearchBackendSupport.java → ...rch/api/support/SearchBackendSupport.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.support;
+package org.apache.maven.search.api.support;
 
-import org.apache.maven.search.SearchBackend;
+import org.apache.maven.search.api.SearchBackend;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...search/support/SearchResponseSupport.java → ...ch/api/support/SearchResponseSupport.java b/...search/support/SearchResponseSupport.java → ...ch/api/support/SearchResponseSupport.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.support;
+package org.apache.maven.search.api.support;
 
 import java.util.List;
 
-import org.apache.maven.search.Record;
-import org.apache.maven.search.SearchRequest;
-import org.apache.maven.search.SearchResponse;
+import org.apache.maven.search.api.Record;
+import org.apache.maven.search.api.SearchRequest;
+import org.apache.maven.search.api.SearchResponse;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/.../transport/Java11HttpClientTransport.java → .../transport/Java11HttpClientTransport.java b/.../transport/Java11HttpClientTransport.java → .../transport/Java11HttpClientTransport.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.transport;
+package org.apache.maven.search.api.transport;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...che/maven/search/transport/Transport.java → ...maven/search/api/transport/Transport.java b/...che/maven/search/transport/Transport.java → ...maven/search/api/transport/Transport.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.search.transport;
+package org.apache.maven.search.api.transport;
 
 import java.io.Closeable;
 import java.io.IOException;

diff --git a/...dexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchBackend.java b/...dexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchBackend.java
@@ -21,8 +21,8 @@
 import java.io.IOException;
 
 import org.apache.maven.index.context.IndexingContext;
-import org.apache.maven.search.SearchBackend;
-import org.apache.maven.search.SearchRequest;
+import org.apache.maven.search.api.SearchBackend;
+import org.apache.maven.search.api.SearchRequest;
 
 /**
  * The Indexer Core search backend.

diff --git a/...exer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchResponse.java b/...exer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchResponse.java
@@ -22,7 +22,7 @@
 
 import org.apache.lucene.search.Query;
 import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.search.SearchResponse;
+import org.apache.maven.search.api.SearchResponse;
 
 /**
  * The Indexer Core search response.

diff --git a/...n/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImpl.java b/...n/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImpl.java
@@ -41,15 +41,15 @@
 import org.apache.maven.index.context.IndexingContext;
 import org.apache.maven.index.expr.SourcedSearchExpression;
 import org.apache.maven.index.search.grouping.GAGrouping;
-import org.apache.maven.search.MAVEN;
-import org.apache.maven.search.Record;
-import org.apache.maven.search.SearchRequest;
+import org.apache.maven.search.api.MAVEN;
+import org.apache.maven.search.api.Record;
+import org.apache.maven.search.api.SearchRequest;
+import org.apache.maven.search.api.request.Field;
+import org.apache.maven.search.api.request.FieldQuery;
+import org.apache.maven.search.api.request.Paging;
+import org.apache.maven.search.api.support.SearchBackendSupport;
 import org.apache.maven.search.backend.indexer.IndexerCoreSearchBackend;
 import org.apache.maven.search.backend.indexer.IndexerCoreSearchResponse;
-import org.apache.maven.search.request.Field;
-import org.apache.maven.search.request.FieldQuery;
-import org.apache.maven.search.request.Paging;
-import org.apache.maven.search.support.SearchBackendSupport;
 
 import static java.util.Objects.requireNonNull;
 
@@ -146,9 +146,10 @@ public IndexerCoreSearchResponse search(SearchRequest searchRequest) throws IOEx
         }
     }
 
-    private Query toQuery(HashSet<Field> searchedFields, org.apache.maven.search.request.Query query) {
-        if (query instanceof org.apache.maven.search.request.BooleanQuery.And) {
-            org.apache.maven.search.request.BooleanQuery bq = (org.apache.maven.search.request.BooleanQuery) query;
+    private Query toQuery(HashSet<Field> searchedFields, org.apache.maven.search.api.request.Query query) {
+        if (query instanceof org.apache.maven.search.api.request.BooleanQuery.And) {
+            org.apache.maven.search.api.request.BooleanQuery bq =
+                    (org.apache.maven.search.api.request.BooleanQuery) query;
             return new BooleanQuery.Builder()
                     .add(new BooleanClause(toQuery(searchedFields, bq.getLeft()), BooleanClause.Occur.MUST))
                     .add(new BooleanClause(toQuery(searchedFields, bq.getRight()), BooleanClause.Occur.MUST))

diff --git a/.../java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchResponseImpl.java b/.../java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchResponseImpl.java
@@ -22,10 +22,10 @@
 
 import org.apache.lucene.search.Query;
 import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.search.Record;
-import org.apache.maven.search.SearchRequest;
+import org.apache.maven.search.api.Record;
+import org.apache.maven.search.api.SearchRequest;
+import org.apache.maven.search.api.support.SearchResponseSupport;
 import org.apache.maven.search.backend.indexer.IndexerCoreSearchResponse;
-import org.apache.maven.search.support.SearchResponseSupport;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...va/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java b/...va/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
@@ -44,22 +44,22 @@
 import org.apache.maven.index.updater.IndexUpdateResult;
 import org.apache.maven.index.updater.IndexUpdater;
 import org.apache.maven.index.updater.ResourceFetcher;
-import org.apache.maven.search.MAVEN;
-import org.apache.maven.search.Record;
-import org.apache.maven.search.SearchRequest;
-import org.apache.maven.search.SearchResponse;
+import org.apache.maven.search.api.MAVEN;
+import org.apache.maven.search.api.Record;
+import org.apache.maven.search.api.SearchRequest;
+import org.apache.maven.search.api.SearchResponse;
+import org.apache.maven.search.api.request.FieldQuery;
 import org.apache.maven.search.backend.indexer.IndexerCoreSearchBackend;
 import org.apache.maven.search.backend.indexer.IndexerCoreSearchBackendFactory;
-import org.apache.maven.search.request.FieldQuery;
 import org.eclipse.sisu.launch.InjectedTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import static java.util.Objects.requireNonNull;
-import static org.apache.maven.search.request.BooleanQuery.and;
-import static org.apache.maven.search.request.Query.query;
+import static org.apache.maven.search.api.request.BooleanQuery.and;
+import static org.apache.maven.search.api.request.Query.query;
 
 @Ignore("This is not a test, is more a showcase")
 public class IndexerCoreSearchBackendImplTest extends InjectedTest {

diff --git a/...oterepository/src/main/java/org/apache/maven/search/backend/remoterepository/Context.java b/...oterepository/src/main/java/org/apache/maven/search/backend/remoterepository/Context.java
@@ -21,12 +21,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.maven.search.MAVEN;
-import org.apache.maven.search.SearchRequest;
-import org.apache.maven.search.request.BooleanQuery;
-import org.apache.maven.search.request.Field;
-import org.apache.maven.search.request.FieldQuery;
-import org.apache.maven.search.request.Query;
+import org.apache.maven.search.api.MAVEN;
+import org.apache.maven.search.api.SearchRequest;
+import org.apache.maven.search.api.request.BooleanQuery;
+import org.apache.maven.search.api.request.Field;
+import org.apache.maven.search.api.request.FieldQuery;
+import org.apache.maven.search.api.request.Query;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...ository/src/main/java/org/apache/maven/search/backend/remoterepository/RecordFactory.java b/...ository/src/main/java/org/apache/maven/search/backend/remoterepository/RecordFactory.java
@@ -21,9 +21,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.maven.search.MAVEN;
-import org.apache.maven.search.Record;
-import org.apache.maven.search.request.Field;
+import org.apache.maven.search.api.MAVEN;
+import org.apache.maven.search.api.Record;
+import org.apache.maven.search.api.request.Field;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/.../java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackend.java b/.../java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackend.java
@@ -20,8 +20,8 @@
 
 import java.io.IOException;
 
-import org.apache.maven.search.SearchBackend;
-import org.apache.maven.search.SearchRequest;
+import org.apache.maven.search.api.SearchBackend;
+import org.apache.maven.search.api.SearchRequest;
 
 /**
  * The Remote Repository search backend.

diff --git a/...rg/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackendFactory.java b/...rg/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackendFactory.java
@@ -18,11 +18,11 @@
  */
 package org.apache.maven.search.backend.remoterepository;
 
+import org.apache.maven.search.api.transport.Java11HttpClientTransport;
+import org.apache.maven.search.api.transport.Transport;
 import org.apache.maven.search.backend.remoterepository.extractor.MavenCentralResponseExtractor;
 import org.apache.maven.search.backend.remoterepository.extractor.Nx2ResponseExtractor;
 import org.apache.maven.search.backend.remoterepository.internal.RemoteRepositorySearchBackendImpl;
-import org.apache.maven.search.transport.Java11HttpClientTransport;
-import org.apache.maven.search.transport.Transport;
 
 /**
  * The remote repository search backend factory.

diff --git a/...java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchResponse.java b/...java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchResponse.java
@@ -18,7 +18,7 @@
  */
 package org.apache.maven.search.backend.remoterepository;
 
-import org.apache.maven.search.SearchResponse;
+import org.apache.maven.search.api.SearchResponse;
 import org.jsoup.nodes.Document;
 
 /**

diff --git a/...ory/src/main/java/org/apache/maven/search/backend/remoterepository/ResponseExtractor.java b/...ory/src/main/java/org/apache/maven/search/backend/remoterepository/ResponseExtractor.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.maven.search.Record;
+import org.apache.maven.search.api.Record;
 import org.jsoup.nodes.Document;
 
 /**

diff --git a/...apache/maven/search/backend/remoterepository/extractor/MavenCentralResponseExtractor.java b/...apache/maven/search/backend/remoterepository/extractor/MavenCentralResponseExtractor.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.maven.search.Record;
+import org.apache.maven.search.api.Record;
 import org.apache.maven.search.backend.remoterepository.Context;
 import org.apache.maven.search.backend.remoterepository.RecordFactory;
 import org.jsoup.nodes.Document;

diff --git a/...java/org/apache/maven/search/backend/remoterepository/extractor/Nx2ResponseExtractor.java b/...java/org/apache/maven/search/backend/remoterepository/extractor/Nx2ResponseExtractor.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.maven.search.Record;
+import org.apache.maven.search.api.Record;
 import org.apache.maven.search.backend.remoterepository.Context;
 import org.apache.maven.search.backend.remoterepository.RecordFactory;
 import org.jsoup.nodes.Document;

diff --git a/.../org/apache/maven/search/backend/remoterepository/extractor/ResponseExtractorSupport.java b/.../org/apache/maven/search/backend/remoterepository/extractor/ResponseExtractorSupport.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.maven.search.Record;
+import org.apache.maven.search.api.Record;
 import org.apache.maven.search.backend.remoterepository.Context;
 import org.apache.maven.search.backend.remoterepository.RecordFactory;
 import org.apache.maven.search.backend.remoterepository.ResponseExtractor;

diff --git a/...che/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImpl.java b/...che/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImpl.java
@@ -29,15 +29,15 @@
 import java.util.Objects;
 import java.util.Properties;
 
-import org.apache.maven.search.Record;
-import org.apache.maven.search.SearchRequest;
+import org.apache.maven.search.api.Record;
+import org.apache.maven.search.api.SearchRequest;
+import org.apache.maven.search.api.support.SearchBackendSupport;
+import org.apache.maven.search.api.transport.Transport;
 import org.apache.maven.search.backend.remoterepository.Context;
 import org.apache.maven.search.backend.remoterepository.RecordFactory;
 import org.apache.maven.search.backend.remoterepository.RemoteRepositorySearchBackend;
 import org.apache.maven.search.backend.remoterepository.RemoteRepositorySearchResponse;
 import org.apache.maven.search.backend.remoterepository.ResponseExtractor;
-import org.apache.maven.search.support.SearchBackendSupport;
-import org.apache.maven.search.transport.Transport;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.parser.Parser;