You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2023/10/25 14:59:47 UTC
[maven-indexer] branch master updated: [MINDEXER-202] Reshuffle packages (#333)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
The following commit(s) were added to refs/heads/master by this push:
new ee91856 [MINDEXER-202] Reshuffle packages (#333)
ee91856 is described below
commit ee918567df98923411319b573c15cba5a326d5a8
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Oct 25 16:59:38 2023 +0200
[MINDEXER-202] Reshuffle packages (#333)
Rework, package changes in Search API to not share packages.
---
https://issues.apache.org/jira/browse/MINDEXER-202
---
pom.xml | 2 ++
.../org/apache/maven/search/{ => api}/MAVEN.java | 8 ++++----
.../org/apache/maven/search/{ => api}/Record.java | 4 ++--
.../maven/search/{ => api}/SearchBackend.java | 2 +-
.../apache/maven/search/{ => api}/SearchEngine.java | 2 +-
.../maven/search/{ => api}/SearchRequest.java | 6 +++---
.../maven/search/{ => api}/SearchResponse.java | 2 +-
.../search/{ => api}/request/BooleanQuery.java | 2 +-
.../maven/search/{ => api}/request/Field.java | 2 +-
.../maven/search/{ => api}/request/FieldQuery.java | 2 +-
.../maven/search/{ => api}/request/Paging.java | 2 +-
.../maven/search/{ => api}/request/Query.java | 2 +-
.../{ => api}/support/SearchBackendSupport.java | 4 ++--
.../{ => api}/support/SearchResponseSupport.java | 8 ++++----
.../transport/Java11HttpClientTransport.java | 2 +-
.../maven/search/{ => api}/transport/Transport.java | 2 +-
.../backend/indexer/IndexerCoreSearchBackend.java | 4 ++--
.../backend/indexer/IndexerCoreSearchResponse.java | 2 +-
.../internal/IndexerCoreSearchBackendImpl.java | 21 +++++++++++----------
.../internal/IndexerCoreSearchResponseImpl.java | 6 +++---
.../internal/IndexerCoreSearchBackendImplTest.java | 14 +++++++-------
.../search/backend/remoterepository/Context.java | 12 ++++++------
.../backend/remoterepository/RecordFactory.java | 6 +++---
.../RemoteRepositorySearchBackend.java | 4 ++--
.../RemoteRepositorySearchBackendFactory.java | 4 ++--
.../RemoteRepositorySearchResponse.java | 2 +-
.../backend/remoterepository/ResponseExtractor.java | 2 +-
.../extractor/MavenCentralResponseExtractor.java | 2 +-
.../extractor/Nx2ResponseExtractor.java | 2 +-
.../extractor/ResponseExtractorSupport.java | 2 +-
.../internal/RemoteRepositorySearchBackendImpl.java | 8 ++++----
.../RemoteRepositorySearchResponseImpl.java | 6 +++---
.../RemoteRepositorySearchBackendImplTest.java | 12 ++++++------
.../maven/search/backend/smo/SmoSearchBackend.java | 4 ++--
.../search/backend/smo/SmoSearchBackendFactory.java | 4 ++--
.../maven/search/backend/smo/SmoSearchResponse.java | 2 +-
.../backend/smo/internal/SmoSearchBackendImpl.java | 20 ++++++++++----------
.../backend/smo/internal/SmoSearchResponseImpl.java | 6 +++---
.../smo/internal/SmoSearchBackendImplTest.java | 12 ++++++------
39 files changed, 106 insertions(+), 103 deletions(-)
diff --git a/pom.xml b/pom.xml
index fadf73c..0dc50b9 100644
--- 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/search-api/src/main/java/org/apache/maven/search/MAVEN.java b/search-api/src/main/java/org/apache/maven/search/api/MAVEN.java
similarity index 93%
rename from search-api/src/main/java/org/apache/maven/search/MAVEN.java
rename to search-api/src/main/java/org/apache/maven/search/api/MAVEN.java
index e9fa686..7ee56df 100644
--- a/search-api/src/main/java/org/apache/maven/search/MAVEN.java
+++ b/search-api/src/main/java/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/search-api/src/main/java/org/apache/maven/search/Record.java b/search-api/src/main/java/org/apache/maven/search/api/Record.java
similarity index 97%
rename from search-api/src/main/java/org/apache/maven/search/Record.java
rename to search-api/src/main/java/org/apache/maven/search/api/Record.java
index 223f741..53856eb 100644
--- a/search-api/src/main/java/org/apache/maven/search/Record.java
+++ b/search-api/src/main/java/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/search-api/src/main/java/org/apache/maven/search/SearchBackend.java b/search-api/src/main/java/org/apache/maven/search/api/SearchBackend.java
similarity index 97%
rename from search-api/src/main/java/org/apache/maven/search/SearchBackend.java
rename to search-api/src/main/java/org/apache/maven/search/api/SearchBackend.java
index 2410ee9..1353750 100644
--- a/search-api/src/main/java/org/apache/maven/search/SearchBackend.java
+++ b/search-api/src/main/java/org/apache/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/search-api/src/main/java/org/apache/maven/search/SearchEngine.java b/search-api/src/main/java/org/apache/maven/search/api/SearchEngine.java
similarity index 96%
rename from search-api/src/main/java/org/apache/maven/search/SearchEngine.java
rename to search-api/src/main/java/org/apache/maven/search/api/SearchEngine.java
index 590941d..05640fa 100644
--- a/search-api/src/main/java/org/apache/maven/search/SearchEngine.java
+++ b/search-api/src/main/java/org/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/search-api/src/main/java/org/apache/maven/search/SearchRequest.java b/search-api/src/main/java/org/apache/maven/search/api/SearchRequest.java
similarity index 93%
rename from search-api/src/main/java/org/apache/maven/search/SearchRequest.java
rename to search-api/src/main/java/org/apache/maven/search/api/SearchRequest.java
index e25b97a..64f50da 100644
--- a/search-api/src/main/java/org/apache/maven/search/SearchRequest.java
+++ b/search-api/src/main/java/org/apache/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/search-api/src/main/java/org/apache/maven/search/SearchResponse.java b/search-api/src/main/java/org/apache/maven/search/api/SearchResponse.java
similarity index 97%
rename from search-api/src/main/java/org/apache/maven/search/SearchResponse.java
rename to search-api/src/main/java/org/apache/maven/search/api/SearchResponse.java
index 933dcb6..37549c6 100644
--- a/search-api/src/main/java/org/apache/maven/search/SearchResponse.java
+++ b/search-api/src/main/java/org/apache/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/search-api/src/main/java/org/apache/maven/search/request/BooleanQuery.java b/search-api/src/main/java/org/apache/maven/search/api/request/BooleanQuery.java
similarity index 98%
rename from search-api/src/main/java/org/apache/maven/search/request/BooleanQuery.java
rename to search-api/src/main/java/org/apache/maven/search/api/request/BooleanQuery.java
index 4318af1..eed6388 100644
--- a/search-api/src/main/java/org/apache/maven/search/request/BooleanQuery.java
+++ b/search-api/src/main/java/org/apache/maven/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/search-api/src/main/java/org/apache/maven/search/request/Field.java b/search-api/src/main/java/org/apache/maven/search/api/request/Field.java
similarity index 98%
rename from search-api/src/main/java/org/apache/maven/search/request/Field.java
rename to search-api/src/main/java/org/apache/maven/search/api/request/Field.java
index 17de593..35cf31c 100644
--- a/search-api/src/main/java/org/apache/maven/search/request/Field.java
+++ b/search-api/src/main/java/org/apache/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/search-api/src/main/java/org/apache/maven/search/request/FieldQuery.java b/search-api/src/main/java/org/apache/maven/search/api/request/FieldQuery.java
similarity index 97%
rename from search-api/src/main/java/org/apache/maven/search/request/FieldQuery.java
rename to search-api/src/main/java/org/apache/maven/search/api/request/FieldQuery.java
index cac5e67..f108142 100644
--- a/search-api/src/main/java/org/apache/maven/search/request/FieldQuery.java
+++ b/search-api/src/main/java/org/apache/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/search-api/src/main/java/org/apache/maven/search/request/Paging.java b/search-api/src/main/java/org/apache/maven/search/api/request/Paging.java
similarity index 97%
rename from search-api/src/main/java/org/apache/maven/search/request/Paging.java
rename to search-api/src/main/java/org/apache/maven/search/api/request/Paging.java
index e38d5ce..6a60de5 100644
--- a/search-api/src/main/java/org/apache/maven/search/request/Paging.java
+++ b/search-api/src/main/java/org/apache/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/search-api/src/main/java/org/apache/maven/search/request/Query.java b/search-api/src/main/java/org/apache/maven/search/api/request/Query.java
similarity index 96%
rename from search-api/src/main/java/org/apache/maven/search/request/Query.java
rename to search-api/src/main/java/org/apache/maven/search/api/request/Query.java
index 2afa778..1a0dcc2 100644
--- a/search-api/src/main/java/org/apache/maven/search/request/Query.java
+++ b/search-api/src/main/java/org/apache/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-api/src/main/java/org/apache/maven/search/support/SearchBackendSupport.java b/search-api/src/main/java/org/apache/maven/search/api/support/SearchBackendSupport.java
similarity index 94%
rename from search-api/src/main/java/org/apache/maven/search/support/SearchBackendSupport.java
rename to search-api/src/main/java/org/apache/maven/search/api/support/SearchBackendSupport.java
index 8863c44..a306a8f 100644
--- a/search-api/src/main/java/org/apache/maven/search/support/SearchBackendSupport.java
+++ b/search-api/src/main/java/org/apache/maven/search/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-api/src/main/java/org/apache/maven/search/support/SearchResponseSupport.java b/search-api/src/main/java/org/apache/maven/search/api/support/SearchResponseSupport.java
similarity index 90%
rename from search-api/src/main/java/org/apache/maven/search/support/SearchResponseSupport.java
rename to search-api/src/main/java/org/apache/maven/search/api/support/SearchResponseSupport.java
index 9af35c4..18317fb 100644
--- a/search-api/src/main/java/org/apache/maven/search/support/SearchResponseSupport.java
+++ b/search-api/src/main/java/org/apache/maven/search/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/search-api/src/main/java/org/apache/maven/search/transport/Java11HttpClientTransport.java b/search-api/src/main/java/org/apache/maven/search/api/transport/Java11HttpClientTransport.java
similarity index 98%
rename from search-api/src/main/java/org/apache/maven/search/transport/Java11HttpClientTransport.java
rename to search-api/src/main/java/org/apache/maven/search/api/transport/Java11HttpClientTransport.java
index 5a0019c..ecc0ccb 100644
--- a/search-api/src/main/java/org/apache/maven/search/transport/Java11HttpClientTransport.java
+++ b/search-api/src/main/java/org/apache/maven/search/api/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/search-api/src/main/java/org/apache/maven/search/transport/Transport.java b/search-api/src/main/java/org/apache/maven/search/api/transport/Transport.java
similarity index 97%
rename from search-api/src/main/java/org/apache/maven/search/transport/Transport.java
rename to search-api/src/main/java/org/apache/maven/search/api/transport/Transport.java
index c8fbc44..9dc1cea 100644
--- a/search-api/src/main/java/org/apache/maven/search/transport/Transport.java
+++ b/search-api/src/main/java/org/apache/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/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchBackend.java b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchBackend.java
index 488c090..5ff38f6 100644
--- a/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchBackend.java
+++ b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchBackend.java
@@ -21,8 +21,8 @@ package org.apache.maven.search.backend.indexer;
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/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchResponse.java b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchResponse.java
index f906451..688eca8 100644
--- a/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchResponse.java
+++ b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/IndexerCoreSearchResponse.java
@@ -22,7 +22,7 @@ import java.util.List;
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/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImpl.java b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImpl.java
index 43d6bec..5e9bf3d 100644
--- a/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImpl.java
+++ b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImpl.java
@@ -41,15 +41,15 @@ import org.apache.maven.index.SearchType;
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 class IndexerCoreSearchBackendImpl extends SearchBackendSupport implement
}
}
- 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/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchResponseImpl.java b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchResponseImpl.java
index c6a87d7..0d2a314 100644
--- a/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchResponseImpl.java
+++ b/search-backend-indexer/src/main/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchResponseImpl.java
@@ -22,10 +22,10 @@ import java.util.List;
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/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java b/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
index dfc2a5b..9173a7e 100644
--- a/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
+++ b/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
@@ -44,13 +44,13 @@ import org.apache.maven.index.updater.IndexUpdateRequest;
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;
@@ -58,8 +58,8 @@ 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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/Context.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/Context.java
index beedc2e..404f441 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/Context.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/Context.java
@@ -21,12 +21,12 @@ package org.apache.maven.search.backend.remoterepository;
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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RecordFactory.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RecordFactory.java
index 4949930..3f828ff 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RecordFactory.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RecordFactory.java
@@ -21,9 +21,9 @@ package org.apache.maven.search.backend.remoterepository;
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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackend.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackend.java
index 27c51e8..4be5a00 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackend.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackend.java
@@ -20,8 +20,8 @@ package org.apache.maven.search.backend.remoterepository;
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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackendFactory.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackendFactory.java
index d2dc515..1f1f501 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchBackendFactory.java
+++ b/search-backend-remoterepository/src/main/java/org/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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchResponse.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchResponse.java
index 87c3bbf..da7d0d3 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/RemoteRepositorySearchResponse.java
+++ b/search-backend-remoterepository/src/main/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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/ResponseExtractor.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/ResponseExtractor.java
index 21d3990..533b2b7 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/ResponseExtractor.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/ResponseExtractor.java
@@ -20,7 +20,7 @@ package org.apache.maven.search.backend.remoterepository;
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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/MavenCentralResponseExtractor.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/MavenCentralResponseExtractor.java
index cc481ad..132852f 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/MavenCentralResponseExtractor.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/MavenCentralResponseExtractor.java
@@ -20,7 +20,7 @@ package org.apache.maven.search.backend.remoterepository.extractor;
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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/Nx2ResponseExtractor.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/Nx2ResponseExtractor.java
index 1f89989..e44e402 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/Nx2ResponseExtractor.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/Nx2ResponseExtractor.java
@@ -20,7 +20,7 @@ package org.apache.maven.search.backend.remoterepository.extractor;
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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/ResponseExtractorSupport.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/ResponseExtractorSupport.java
index ef5f5fd..9c71748 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/ResponseExtractorSupport.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/extractor/ResponseExtractorSupport.java
@@ -20,7 +20,7 @@ package org.apache.maven.search.backend.remoterepository.extractor;
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/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImpl.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImpl.java
index 748a88a..6a29561 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImpl.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImpl.java
@@ -29,15 +29,15 @@ import java.util.Map;
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;
diff --git a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchResponseImpl.java b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchResponseImpl.java
index 8d5d3e2..4970e5f 100644
--- a/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchResponseImpl.java
+++ b/search-backend-remoterepository/src/main/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchResponseImpl.java
@@ -20,10 +20,10 @@ package org.apache.maven.search.backend.remoterepository.internal;
import java.util.List;
-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.remoterepository.RemoteRepositorySearchResponse;
-import org.apache.maven.search.support.SearchResponseSupport;
import org.jsoup.nodes.Document;
import static java.util.Objects.requireNonNull;
diff --git a/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java b/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java
index 8e19c33..f45c21f 100644
--- a/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java
+++ b/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java
@@ -26,15 +26,15 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-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.BooleanQuery;
+import org.apache.maven.search.api.request.FieldQuery;
+import org.apache.maven.search.api.request.Query;
import org.apache.maven.search.backend.remoterepository.RemoteRepositorySearchBackend;
import org.apache.maven.search.backend.remoterepository.RemoteRepositorySearchBackendFactory;
import org.apache.maven.search.backend.remoterepository.RemoteRepositorySearchResponse;
-import org.apache.maven.search.request.BooleanQuery;
-import org.apache.maven.search.request.FieldQuery;
-import org.apache.maven.search.request.Query;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackend.java b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackend.java
index e679014..be890c5 100644
--- a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackend.java
+++ b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackend.java
@@ -20,8 +20,8 @@ package org.apache.maven.search.backend.smo;
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 SMO search backend.
diff --git a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackendFactory.java b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackendFactory.java
index d7ad33b..6ac6144 100644
--- a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackendFactory.java
+++ b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchBackendFactory.java
@@ -18,9 +18,9 @@
*/
package org.apache.maven.search.backend.smo;
+import org.apache.maven.search.api.transport.Java11HttpClientTransport;
+import org.apache.maven.search.api.transport.Transport;
import org.apache.maven.search.backend.smo.internal.SmoSearchBackendImpl;
-import org.apache.maven.search.transport.Java11HttpClientTransport;
-import org.apache.maven.search.transport.Transport;
/**
* The SMO search backend factory.
diff --git a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchResponse.java b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchResponse.java
index 27d571d..c01c9e4 100644
--- a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchResponse.java
+++ b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/SmoSearchResponse.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.search.backend.smo;
-import org.apache.maven.search.SearchResponse;
+import org.apache.maven.search.api.SearchResponse;
/**
* The SMO search response.
diff --git a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImpl.java b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImpl.java
index 9573a1a..6f8b8b1 100644
--- a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImpl.java
+++ b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImpl.java
@@ -35,18 +35,18 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
-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.BooleanQuery;
+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.request.Query;
+import org.apache.maven.search.api.support.SearchBackendSupport;
+import org.apache.maven.search.api.transport.Transport;
import org.apache.maven.search.backend.smo.SmoSearchBackend;
import org.apache.maven.search.backend.smo.SmoSearchResponse;
-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.Paging;
-import org.apache.maven.search.request.Query;
-import org.apache.maven.search.support.SearchBackendSupport;
-import org.apache.maven.search.transport.Transport;
import static java.util.Objects.requireNonNull;
diff --git a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchResponseImpl.java b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchResponseImpl.java
index a443189..f5cab8d 100644
--- a/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchResponseImpl.java
+++ b/search-backend-smo/src/main/java/org/apache/maven/search/backend/smo/internal/SmoSearchResponseImpl.java
@@ -20,10 +20,10 @@ package org.apache.maven.search.backend.smo.internal;
import java.util.List;
-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.smo.SmoSearchResponse;
-import org.apache.maven.search.support.SearchResponseSupport;
import static java.util.Objects.requireNonNull;
diff --git a/search-backend-smo/src/test/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImplTest.java b/search-backend-smo/src/test/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImplTest.java
index aa6eed1..932bdac 100644
--- a/search-backend-smo/src/test/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImplTest.java
+++ b/search-backend-smo/src/test/java/org/apache/maven/search/backend/smo/internal/SmoSearchBackendImplTest.java
@@ -24,15 +24,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-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.BooleanQuery;
+import org.apache.maven.search.api.request.FieldQuery;
+import org.apache.maven.search.api.request.Query;
import org.apache.maven.search.backend.smo.SmoSearchBackend;
import org.apache.maven.search.backend.smo.SmoSearchBackendFactory;
import org.apache.maven.search.backend.smo.SmoSearchResponse;
-import org.apache.maven.search.request.BooleanQuery;
-import org.apache.maven.search.request.FieldQuery;
-import org.apache.maven.search.request.Query;
import org.junit.Ignore;
import org.junit.Test;