diff --git a/README.md b/README.md index 5836cfc04..393dce621 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ In order to get start using the java client one needs to add it's dependency: ```xml - technology.semi.weaviate + io.weaviate client 3.6.5 @@ -21,10 +21,12 @@ Here's a simple code to start up working with Java client: 2. Connect to Weaviate on `localhost:8080` and fetch meta information ```java -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.misc.model.Meta; +package io.weaviate; + +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.misc.model.Meta; public class App { public static void main(String[] args) { diff --git a/pom.xml b/pom.xml index 9bcc31f16..78d29a3fb 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - technology.semi.weaviate + io.weaviate client jar 3.6.6-SNAPSHOT diff --git a/secrets.tar.gpg b/secrets.tar.gpg index b7f6a306b..54d3c00a8 100644 Binary files a/secrets.tar.gpg and b/secrets.tar.gpg differ diff --git a/src/main/java/technology/semi/weaviate/client/Config.java b/src/main/java/io/weaviate/client/Config.java similarity index 97% rename from src/main/java/technology/semi/weaviate/client/Config.java rename to src/main/java/io/weaviate/client/Config.java index 174770b96..f236b7e2a 100644 --- a/src/main/java/technology/semi/weaviate/client/Config.java +++ b/src/main/java/io/weaviate/client/Config.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client; +package io.weaviate.client; import java.util.Map; diff --git a/src/main/java/technology/semi/weaviate/client/WeaviateAuthClient.java b/src/main/java/io/weaviate/client/WeaviateAuthClient.java similarity index 75% rename from src/main/java/technology/semi/weaviate/client/WeaviateAuthClient.java rename to src/main/java/io/weaviate/client/WeaviateAuthClient.java index 71f1735a5..466b8f28e 100644 --- a/src/main/java/technology/semi/weaviate/client/WeaviateAuthClient.java +++ b/src/main/java/io/weaviate/client/WeaviateAuthClient.java @@ -1,10 +1,10 @@ -package technology.semi.weaviate.client; +package io.weaviate.client; +import io.weaviate.client.v1.auth.BearerTokenFlow; +import io.weaviate.client.v1.auth.ClientCredentialsFlow; +import io.weaviate.client.v1.auth.ResourceOwnerPasswordFlow; +import io.weaviate.client.v1.auth.exception.AuthException; import java.util.List; -import technology.semi.weaviate.client.v1.auth.BearerTokenFlow; -import technology.semi.weaviate.client.v1.auth.ClientCredentialsFlow; -import technology.semi.weaviate.client.v1.auth.ResourceOwnerPasswordFlow; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; public class WeaviateAuthClient { diff --git a/src/main/java/technology/semi/weaviate/client/WeaviateClient.java b/src/main/java/io/weaviate/client/WeaviateClient.java similarity index 57% rename from src/main/java/technology/semi/weaviate/client/WeaviateClient.java rename to src/main/java/io/weaviate/client/WeaviateClient.java index f2033e76a..c3efb8a7b 100644 --- a/src/main/java/technology/semi/weaviate/client/WeaviateClient.java +++ b/src/main/java/io/weaviate/client/WeaviateClient.java @@ -1,24 +1,24 @@ -package technology.semi.weaviate.client; - +package io.weaviate.client; + +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.http.builder.HttpApacheClientBuilder; +import io.weaviate.client.base.http.impl.CommonsHttpClientImpl; +import io.weaviate.client.base.util.DbVersionProvider; +import io.weaviate.client.base.util.DbVersionSupport; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; +import io.weaviate.client.v1.backup.Backup; +import io.weaviate.client.v1.batch.Batch; +import io.weaviate.client.v1.classifications.Classifications; +import io.weaviate.client.v1.cluster.Cluster; +import io.weaviate.client.v1.contextionary.Contextionary; +import io.weaviate.client.v1.data.Data; +import io.weaviate.client.v1.graphql.GraphQL; +import io.weaviate.client.v1.misc.Misc; +import io.weaviate.client.v1.misc.api.MetaGetter; +import io.weaviate.client.v1.schema.Schema; import java.util.Calendar; import java.util.Date; import java.util.Optional; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.http.builder.HttpApacheClientBuilder; -import technology.semi.weaviate.client.base.http.impl.CommonsHttpClientImpl; -import technology.semi.weaviate.client.base.util.DbVersionProvider; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; -import technology.semi.weaviate.client.v1.backup.Backup; -import technology.semi.weaviate.client.v1.batch.Batch; -import technology.semi.weaviate.client.v1.classifications.Classifications; -import technology.semi.weaviate.client.v1.cluster.Cluster; -import technology.semi.weaviate.client.v1.contextionary.Contextionary; -import technology.semi.weaviate.client.v1.data.Data; -import technology.semi.weaviate.client.v1.graphql.GraphQL; -import technology.semi.weaviate.client.v1.misc.Misc; -import technology.semi.weaviate.client.v1.misc.api.MetaGetter; -import technology.semi.weaviate.client.v1.schema.Schema; public class WeaviateClient { private final Config config; @@ -32,15 +32,6 @@ public WeaviateClient(Config config) { public WeaviateClient(Config config, AccessTokenProvider tokenProvider) { this(config, new CommonsHttpClientImpl(config.getHeaders(), tokenProvider, HttpApacheClientBuilder.build(config))); - Calendar cal = Calendar.getInstance(); - cal.set(2023, Calendar.MARCH, 14, 0, 0, 0); - Date relocationDate = cal.getTime(); - Date now = new Date(); - if (now.after(relocationDate)) { - System.err.println("WARNING: On 2023-03-14 base package of Weaviate Java client moved from technology.semi.weaviate.client.* to" + - " io.weaviate.client.* Please update your imports." + - "This warning will disappear after updating."); - } } public WeaviateClient(Config config, HttpClient httpClient) { diff --git a/src/main/java/technology/semi/weaviate/client/base/BaseClient.java b/src/main/java/io/weaviate/client/base/BaseClient.java similarity index 87% rename from src/main/java/technology/semi/weaviate/client/base/BaseClient.java rename to src/main/java/io/weaviate/client/base/BaseClient.java index 2deb1fb4e..c3c0a528b 100644 --- a/src/main/java/technology/semi/weaviate/client/base/BaseClient.java +++ b/src/main/java/io/weaviate/client/base/BaseClient.java @@ -1,15 +1,10 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.http.HttpResponse; import java.util.Collections; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.apache.http.client.config.RequestConfig; -import org.apache.http.impl.client.HttpClientBuilder; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.http.HttpResponse; -import technology.semi.weaviate.client.base.http.impl.CommonsHttpClientImpl; + +import io.weaviate.client.Config; public abstract class BaseClient { private final HttpClient client; diff --git a/src/main/java/technology/semi/weaviate/client/base/ClientResult.java b/src/main/java/io/weaviate/client/base/ClientResult.java similarity index 55% rename from src/main/java/technology/semi/weaviate/client/base/ClientResult.java rename to src/main/java/io/weaviate/client/base/ClientResult.java index fad708279..b426d702b 100644 --- a/src/main/java/technology/semi/weaviate/client/base/ClientResult.java +++ b/src/main/java/io/weaviate/client/base/ClientResult.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; public interface ClientResult { Result run(); diff --git a/src/main/java/technology/semi/weaviate/client/base/Response.java b/src/main/java/io/weaviate/client/base/Response.java similarity index 86% rename from src/main/java/technology/semi/weaviate/client/base/Response.java rename to src/main/java/io/weaviate/client/base/Response.java index fee401984..43d8f8b65 100644 --- a/src/main/java/technology/semi/weaviate/client/base/Response.java +++ b/src/main/java/io/weaviate/client/base/Response.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/technology/semi/weaviate/client/base/Result.java b/src/main/java/io/weaviate/client/base/Result.java similarity index 96% rename from src/main/java/technology/semi/weaviate/client/base/Result.java rename to src/main/java/io/weaviate/client/base/Result.java index 6bc61eeb6..f4d999a8a 100644 --- a/src/main/java/technology/semi/weaviate/client/base/Result.java +++ b/src/main/java/io/weaviate/client/base/Result.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; import java.util.Collections; import java.util.List; diff --git a/src/main/java/technology/semi/weaviate/client/base/Serializer.java b/src/main/java/io/weaviate/client/base/Serializer.java similarity index 90% rename from src/main/java/technology/semi/weaviate/client/base/Serializer.java rename to src/main/java/io/weaviate/client/base/Serializer.java index 0faa02e69..c27731f93 100644 --- a/src/main/java/technology/semi/weaviate/client/base/Serializer.java +++ b/src/main/java/io/weaviate/client/base/Serializer.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/technology/semi/weaviate/client/base/WeaviateError.java b/src/main/java/io/weaviate/client/base/WeaviateError.java similarity index 88% rename from src/main/java/technology/semi/weaviate/client/base/WeaviateError.java rename to src/main/java/io/weaviate/client/base/WeaviateError.java index fb9fd1e0a..b05cdb2e6 100644 --- a/src/main/java/technology/semi/weaviate/client/base/WeaviateError.java +++ b/src/main/java/io/weaviate/client/base/WeaviateError.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; import java.util.List; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/base/WeaviateErrorMessage.java b/src/main/java/io/weaviate/client/base/WeaviateErrorMessage.java similarity index 87% rename from src/main/java/technology/semi/weaviate/client/base/WeaviateErrorMessage.java rename to src/main/java/io/weaviate/client/base/WeaviateErrorMessage.java index b7d4900d6..32a0ea63c 100644 --- a/src/main/java/technology/semi/weaviate/client/base/WeaviateErrorMessage.java +++ b/src/main/java/io/weaviate/client/base/WeaviateErrorMessage.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/base/WeaviateErrorResponse.java b/src/main/java/io/weaviate/client/base/WeaviateErrorResponse.java similarity index 88% rename from src/main/java/technology/semi/weaviate/client/base/WeaviateErrorResponse.java rename to src/main/java/io/weaviate/client/base/WeaviateErrorResponse.java index f440f4012..f35fc5e92 100644 --- a/src/main/java/technology/semi/weaviate/client/base/WeaviateErrorResponse.java +++ b/src/main/java/io/weaviate/client/base/WeaviateErrorResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; import java.util.List; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/base/http/HttpClient.java b/src/main/java/io/weaviate/client/base/http/HttpClient.java similarity index 89% rename from src/main/java/technology/semi/weaviate/client/base/http/HttpClient.java rename to src/main/java/io/weaviate/client/base/http/HttpClient.java index 9e914b29a..38d5561da 100644 --- a/src/main/java/technology/semi/weaviate/client/base/http/HttpClient.java +++ b/src/main/java/io/weaviate/client/base/http/HttpClient.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.http; +package io.weaviate.client.base.http; public interface HttpClient { HttpResponse sendGetRequest(String url) throws Exception; diff --git a/src/main/java/technology/semi/weaviate/client/base/http/HttpResponse.java b/src/main/java/io/weaviate/client/base/http/HttpResponse.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/base/http/HttpResponse.java rename to src/main/java/io/weaviate/client/base/http/HttpResponse.java index de91b3833..09afe4e15 100644 --- a/src/main/java/technology/semi/weaviate/client/base/http/HttpResponse.java +++ b/src/main/java/io/weaviate/client/base/http/HttpResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.http; +package io.weaviate.client.base.http; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/technology/semi/weaviate/client/base/http/builder/HttpApacheClientBuilder.java b/src/main/java/io/weaviate/client/base/http/builder/HttpApacheClientBuilder.java similarity index 77% rename from src/main/java/technology/semi/weaviate/client/base/http/builder/HttpApacheClientBuilder.java rename to src/main/java/io/weaviate/client/base/http/builder/HttpApacheClientBuilder.java index 95a3ce711..9e6295c1a 100644 --- a/src/main/java/technology/semi/weaviate/client/base/http/builder/HttpApacheClientBuilder.java +++ b/src/main/java/io/weaviate/client/base/http/builder/HttpApacheClientBuilder.java @@ -1,9 +1,9 @@ -package technology.semi.weaviate.client.base.http.builder; +package io.weaviate.client.base.http.builder; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.HttpClientBuilder; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.impl.CommonsHttpClientImpl; +import io.weaviate.client.Config; +import io.weaviate.client.base.http.impl.CommonsHttpClientImpl; public class HttpApacheClientBuilder { diff --git a/src/main/java/technology/semi/weaviate/client/base/http/impl/CommonsHttpClientImpl.java b/src/main/java/io/weaviate/client/base/http/impl/CommonsHttpClientImpl.java similarity index 92% rename from src/main/java/technology/semi/weaviate/client/base/http/impl/CommonsHttpClientImpl.java rename to src/main/java/io/weaviate/client/base/http/impl/CommonsHttpClientImpl.java index e97ecaff1..14fc21fef 100644 --- a/src/main/java/technology/semi/weaviate/client/base/http/impl/CommonsHttpClientImpl.java +++ b/src/main/java/io/weaviate/client/base/http/impl/CommonsHttpClientImpl.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.http.impl; +package io.weaviate.client.base.http.impl; import java.io.Closeable; import java.io.IOException; @@ -16,14 +16,13 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.http.HttpResponse; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.http.HttpResponse; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Map; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; -import technology.semi.weaviate.client.v1.auth.provider.AuthRefreshTokenProvider; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; public class CommonsHttpClientImpl implements HttpClient, Closeable { private final Map headers; diff --git a/src/main/java/technology/semi/weaviate/client/base/util/Assert.java b/src/main/java/io/weaviate/client/base/util/Assert.java similarity index 93% rename from src/main/java/technology/semi/weaviate/client/base/util/Assert.java rename to src/main/java/io/weaviate/client/base/util/Assert.java index 95b16e1ed..ff0955495 100644 --- a/src/main/java/technology/semi/weaviate/client/base/util/Assert.java +++ b/src/main/java/io/weaviate/client/base/util/Assert.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; import java.util.Objects; diff --git a/src/main/java/technology/semi/weaviate/client/base/util/BeaconPath.java b/src/main/java/io/weaviate/client/base/util/BeaconPath.java similarity index 97% rename from src/main/java/technology/semi/weaviate/client/base/util/BeaconPath.java rename to src/main/java/io/weaviate/client/base/util/BeaconPath.java index 7ad1f07b2..b2bfe3b3e 100644 --- a/src/main/java/technology/semi/weaviate/client/base/util/BeaconPath.java +++ b/src/main/java/io/weaviate/client/base/util/BeaconPath.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/base/util/DbVersionProvider.java b/src/main/java/io/weaviate/client/base/util/DbVersionProvider.java similarity index 92% rename from src/main/java/technology/semi/weaviate/client/base/util/DbVersionProvider.java rename to src/main/java/io/weaviate/client/base/util/DbVersionProvider.java index 84b06f60f..a012afbdf 100644 --- a/src/main/java/technology/semi/weaviate/client/base/util/DbVersionProvider.java +++ b/src/main/java/io/weaviate/client/base/util/DbVersionProvider.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; import java.util.Optional; diff --git a/src/main/java/technology/semi/weaviate/client/base/util/DbVersionSupport.java b/src/main/java/io/weaviate/client/base/util/DbVersionSupport.java similarity index 97% rename from src/main/java/technology/semi/weaviate/client/base/util/DbVersionSupport.java rename to src/main/java/io/weaviate/client/base/util/DbVersionSupport.java index 6709ac82e..72db08f0c 100644 --- a/src/main/java/technology/semi/weaviate/client/base/util/DbVersionSupport.java +++ b/src/main/java/io/weaviate/client/base/util/DbVersionSupport.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/technology/semi/weaviate/client/base/util/TriConsumer.java b/src/main/java/io/weaviate/client/base/util/TriConsumer.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/base/util/TriConsumer.java rename to src/main/java/io/weaviate/client/base/util/TriConsumer.java index 4ebd7e605..4a38d12fa 100644 --- a/src/main/java/technology/semi/weaviate/client/base/util/TriConsumer.java +++ b/src/main/java/io/weaviate/client/base/util/TriConsumer.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; @FunctionalInterface public interface TriConsumer { diff --git a/src/main/java/io/weaviate/client/v1/auth/Authentication.java b/src/main/java/io/weaviate/client/v1/auth/Authentication.java new file mode 100644 index 000000000..b278a33a5 --- /dev/null +++ b/src/main/java/io/weaviate/client/v1/auth/Authentication.java @@ -0,0 +1,11 @@ +package io.weaviate.client.v1.auth; + +import io.weaviate.client.v1.auth.exception.AuthException; +import java.util.List; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; + +public interface Authentication { + WeaviateClient getAuthClient(Config config, List scopes) throws AuthException; + WeaviateClient getAuthClient(Config config) throws AuthException; +} diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/BearerTokenFlow.java b/src/main/java/io/weaviate/client/v1/auth/BearerTokenFlow.java similarity index 69% rename from src/main/java/technology/semi/weaviate/client/v1/auth/BearerTokenFlow.java rename to src/main/java/io/weaviate/client/v1/auth/BearerTokenFlow.java index 29eb3b5e4..dbbb189c7 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/BearerTokenFlow.java +++ b/src/main/java/io/weaviate/client/v1/auth/BearerTokenFlow.java @@ -1,14 +1,14 @@ -package technology.semi.weaviate.client.v1.auth; +package io.weaviate.client.v1.auth; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.auth.nimbus.BaseAuth; +import io.weaviate.client.v1.auth.nimbus.NimbusAuth; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; +import io.weaviate.client.v1.auth.provider.AuthRefreshTokenProvider; import java.util.List; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.auth.nimbus.BaseAuth; -import technology.semi.weaviate.client.v1.auth.nimbus.NimbusAuth; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; -import technology.semi.weaviate.client.v1.auth.provider.AuthRefreshTokenProvider; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; public class BearerTokenFlow implements Authentication { diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/ClientCredentialsFlow.java b/src/main/java/io/weaviate/client/v1/auth/ClientCredentialsFlow.java similarity index 63% rename from src/main/java/technology/semi/weaviate/client/v1/auth/ClientCredentialsFlow.java rename to src/main/java/io/weaviate/client/v1/auth/ClientCredentialsFlow.java index 83ac35e1a..54790a4d1 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/ClientCredentialsFlow.java +++ b/src/main/java/io/weaviate/client/v1/auth/ClientCredentialsFlow.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.auth; +package io.weaviate.client.v1.auth; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.auth.nimbus.AuthType; +import io.weaviate.client.v1.auth.nimbus.NimbusAuth; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; import java.util.List; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.auth.nimbus.AuthType; -import technology.semi.weaviate.client.v1.auth.nimbus.NimbusAuth; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; public class ClientCredentialsFlow implements Authentication { diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/ResourceOwnerPasswordFlow.java b/src/main/java/io/weaviate/client/v1/auth/ResourceOwnerPasswordFlow.java similarity index 72% rename from src/main/java/technology/semi/weaviate/client/v1/auth/ResourceOwnerPasswordFlow.java rename to src/main/java/io/weaviate/client/v1/auth/ResourceOwnerPasswordFlow.java index 1c49a9f9a..158395993 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/ResourceOwnerPasswordFlow.java +++ b/src/main/java/io/weaviate/client/v1/auth/ResourceOwnerPasswordFlow.java @@ -1,13 +1,13 @@ -package technology.semi.weaviate.client.v1.auth; +package io.weaviate.client.v1.auth; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.auth.nimbus.AuthType; +import io.weaviate.client.v1.auth.nimbus.NimbusAuth; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; import java.util.ArrayList; import java.util.List; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.auth.nimbus.AuthType; -import technology.semi.weaviate.client.v1.auth.nimbus.NimbusAuth; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; public class ResourceOwnerPasswordFlow implements Authentication { diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/exception/AuthException.java b/src/main/java/io/weaviate/client/v1/auth/exception/AuthException.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/auth/exception/AuthException.java rename to src/main/java/io/weaviate/client/v1/auth/exception/AuthException.java index f5caf3f49..ceb604d8b 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/exception/AuthException.java +++ b/src/main/java/io/weaviate/client/v1/auth/exception/AuthException.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.auth.exception; +package io.weaviate.client.v1.auth.exception; public class AuthException extends Exception { public AuthException(String message) { diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/AuthType.java b/src/main/java/io/weaviate/client/v1/auth/nimbus/AuthType.java similarity index 59% rename from src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/AuthType.java rename to src/main/java/io/weaviate/client/v1/auth/nimbus/AuthType.java index fc08264a2..d7aebb96d 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/AuthType.java +++ b/src/main/java/io/weaviate/client/v1/auth/nimbus/AuthType.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.auth.nimbus; +package io.weaviate.client.v1.auth.nimbus; public enum AuthType { USER_PASSWORD, diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/BaseAuth.java b/src/main/java/io/weaviate/client/v1/auth/nimbus/BaseAuth.java similarity index 80% rename from src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/BaseAuth.java rename to src/main/java/io/weaviate/client/v1/auth/nimbus/BaseAuth.java index b487c2a93..aea3b3532 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/BaseAuth.java +++ b/src/main/java/io/weaviate/client/v1/auth/nimbus/BaseAuth.java @@ -1,14 +1,14 @@ -package technology.semi.weaviate.client.v1.auth.nimbus; +package io.weaviate.client.v1.auth.nimbus; +import io.weaviate.client.base.http.builder.HttpApacheClientBuilder; +import io.weaviate.client.base.http.impl.CommonsHttpClientImpl; import lombok.AllArgsConstructor; import lombok.Getter; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.Serializer; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.http.HttpResponse; -import technology.semi.weaviate.client.base.http.builder.HttpApacheClientBuilder; -import technology.semi.weaviate.client.base.http.impl.CommonsHttpClientImpl; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.Config; +import io.weaviate.client.base.Serializer; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.http.HttpResponse; +import io.weaviate.client.v1.auth.exception.AuthException; public class BaseAuth { public final static String OIDC_URL = "/.well-known/openid-configuration"; diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/NimbusAuth.java b/src/main/java/io/weaviate/client/v1/auth/nimbus/NimbusAuth.java similarity index 94% rename from src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/NimbusAuth.java rename to src/main/java/io/weaviate/client/v1/auth/nimbus/NimbusAuth.java index 1a50d6f4c..327865c3e 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/NimbusAuth.java +++ b/src/main/java/io/weaviate/client/v1/auth/nimbus/NimbusAuth.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.auth.nimbus; +package io.weaviate.client.v1.auth.nimbus; import com.nimbusds.oauth2.sdk.AuthorizationGrant; import com.nimbusds.oauth2.sdk.ClientCredentialsGrant; @@ -18,6 +18,8 @@ import com.nimbusds.openid.connect.sdk.OIDCTokenResponse; import com.nimbusds.openid.connect.sdk.OIDCTokenResponseParser; import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata; +import io.weaviate.client.v1.auth.provider.AuthClientCredentialsTokenProvider; +import io.weaviate.client.v1.auth.provider.AuthRefreshTokenProvider; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Calendar; @@ -25,11 +27,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; -import technology.semi.weaviate.client.v1.auth.provider.AuthClientCredentialsTokenProvider; -import technology.semi.weaviate.client.v1.auth.provider.AuthRefreshTokenProvider; +import io.weaviate.client.Config; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; public class NimbusAuth extends BaseAuth { diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/provider/AccessTokenProvider.java b/src/main/java/io/weaviate/client/v1/auth/provider/AccessTokenProvider.java similarity index 60% rename from src/main/java/technology/semi/weaviate/client/v1/auth/provider/AccessTokenProvider.java rename to src/main/java/io/weaviate/client/v1/auth/provider/AccessTokenProvider.java index cfd99e73e..b46738b90 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/provider/AccessTokenProvider.java +++ b/src/main/java/io/weaviate/client/v1/auth/provider/AccessTokenProvider.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.auth.provider; +package io.weaviate.client.v1.auth.provider; public interface AccessTokenProvider { String getAccessToken(); diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/provider/AuthClientCredentialsTokenProvider.java b/src/main/java/io/weaviate/client/v1/auth/provider/AuthClientCredentialsTokenProvider.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/v1/auth/provider/AuthClientCredentialsTokenProvider.java rename to src/main/java/io/weaviate/client/v1/auth/provider/AuthClientCredentialsTokenProvider.java index 79290e718..01d548ed3 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/provider/AuthClientCredentialsTokenProvider.java +++ b/src/main/java/io/weaviate/client/v1/auth/provider/AuthClientCredentialsTokenProvider.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.auth.provider; +package io.weaviate.client.v1.auth.provider; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.v1.auth.nimbus.BaseAuth; -import technology.semi.weaviate.client.v1.auth.nimbus.NimbusAuth; +import io.weaviate.client.Config; +import io.weaviate.client.v1.auth.nimbus.BaseAuth; +import io.weaviate.client.v1.auth.nimbus.NimbusAuth; public class AuthClientCredentialsTokenProvider implements AccessTokenProvider { diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/provider/AuthRefreshTokenProvider.java b/src/main/java/io/weaviate/client/v1/auth/provider/AuthRefreshTokenProvider.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/auth/provider/AuthRefreshTokenProvider.java rename to src/main/java/io/weaviate/client/v1/auth/provider/AuthRefreshTokenProvider.java index c43c29232..c6bee26a8 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/provider/AuthRefreshTokenProvider.java +++ b/src/main/java/io/weaviate/client/v1/auth/provider/AuthRefreshTokenProvider.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.auth.provider; +package io.weaviate.client.v1.auth.provider; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.v1.auth.nimbus.BaseAuth; -import technology.semi.weaviate.client.v1.auth.nimbus.NimbusAuth; +import io.weaviate.client.Config; +import io.weaviate.client.v1.auth.nimbus.BaseAuth; +import io.weaviate.client.v1.auth.nimbus.NimbusAuth; public class AuthRefreshTokenProvider implements AccessTokenProvider { private final NimbusAuth nimbusAuth; diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/Backup.java b/src/main/java/io/weaviate/client/v1/backup/Backup.java similarity index 57% rename from src/main/java/technology/semi/weaviate/client/v1/backup/Backup.java rename to src/main/java/io/weaviate/client/v1/backup/Backup.java index c25bb1324..c193df816 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/Backup.java +++ b/src/main/java/io/weaviate/client/v1/backup/Backup.java @@ -1,13 +1,12 @@ -package technology.semi.weaviate.client.v1.backup; +package io.weaviate.client.v1.backup; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.backup.api.BackupCreateStatusGetter; +import io.weaviate.client.v1.backup.api.BackupCreator; +import io.weaviate.client.v1.backup.api.BackupRestoreStatusGetter; +import io.weaviate.client.v1.backup.api.BackupRestorer; import lombok.RequiredArgsConstructor; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.backup.api.BackupCreateStatusGetter; -import technology.semi.weaviate.client.v1.backup.api.BackupCreator; -//import technology.semi.weaviate.client.v1.backup.api.BackupGetter; -import technology.semi.weaviate.client.v1.backup.api.BackupRestoreStatusGetter; -import technology.semi.weaviate.client.v1.backup.api.BackupRestorer; +import io.weaviate.client.Config; @RequiredArgsConstructor public class Backup { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupCreateStatusGetter.java b/src/main/java/io/weaviate/client/v1/backup/api/BackupCreateStatusGetter.java similarity index 65% rename from src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupCreateStatusGetter.java rename to src/main/java/io/weaviate/client/v1/backup/api/BackupCreateStatusGetter.java index df4dd8a11..dafb25c91 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupCreateStatusGetter.java +++ b/src/main/java/io/weaviate/client/v1/backup/api/BackupCreateStatusGetter.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.backup.api; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.backup.model.BackupCreateStatusResponse; +package io.weaviate.client.v1.backup.api; + +import io.weaviate.client.v1.backup.model.BackupCreateStatusResponse; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; public class BackupCreateStatusGetter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupCreator.java b/src/main/java/io/weaviate/client/v1/backup/api/BackupCreator.java similarity index 86% rename from src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupCreator.java rename to src/main/java/io/weaviate/client/v1/backup/api/BackupCreator.java index 8654946c7..92354f49a 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupCreator.java +++ b/src/main/java/io/weaviate/client/v1/backup/api/BackupCreator.java @@ -1,16 +1,16 @@ -package technology.semi.weaviate.client.v1.backup.api; +package io.weaviate.client.v1.backup.api; +import io.weaviate.client.v1.backup.model.BackupCreateResponse; +import io.weaviate.client.v1.backup.model.BackupCreateStatusResponse; +import io.weaviate.client.v1.backup.model.CreateStatus; import lombok.Builder; import lombok.Getter; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.backup.model.BackupCreateResponse; -import technology.semi.weaviate.client.v1.backup.model.BackupCreateStatusResponse; -import technology.semi.weaviate.client.v1.backup.model.CreateStatus; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; public class BackupCreator extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupGetter.java b/src/main/java/io/weaviate/client/v1/backup/api/BackupGetter.java similarity index 58% rename from src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupGetter.java rename to src/main/java/io/weaviate/client/v1/backup/api/BackupGetter.java index e92f84109..1ffe390d7 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupGetter.java +++ b/src/main/java/io/weaviate/client/v1/backup/api/BackupGetter.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.backup.api; +package io.weaviate.client.v1.backup.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.backup.model.BackupCreateResponse; +import io.weaviate.client.v1.backup.model.BackupCreateResponse; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; public class BackupGetter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupRestoreStatusGetter.java b/src/main/java/io/weaviate/client/v1/backup/api/BackupRestoreStatusGetter.java similarity index 65% rename from src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupRestoreStatusGetter.java rename to src/main/java/io/weaviate/client/v1/backup/api/BackupRestoreStatusGetter.java index 466f5a9fd..06ffa72ae 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupRestoreStatusGetter.java +++ b/src/main/java/io/weaviate/client/v1/backup/api/BackupRestoreStatusGetter.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.backup.api; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.backup.model.BackupRestoreStatusResponse; +package io.weaviate.client.v1.backup.api; + +import io.weaviate.client.v1.backup.model.BackupRestoreStatusResponse; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; public class BackupRestoreStatusGetter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupRestorer.java b/src/main/java/io/weaviate/client/v1/backup/api/BackupRestorer.java similarity index 86% rename from src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupRestorer.java rename to src/main/java/io/weaviate/client/v1/backup/api/BackupRestorer.java index 305138703..7c111e8d8 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/api/BackupRestorer.java +++ b/src/main/java/io/weaviate/client/v1/backup/api/BackupRestorer.java @@ -1,16 +1,16 @@ -package technology.semi.weaviate.client.v1.backup.api; +package io.weaviate.client.v1.backup.api; +import io.weaviate.client.v1.backup.model.BackupRestoreResponse; +import io.weaviate.client.v1.backup.model.BackupRestoreStatusResponse; +import io.weaviate.client.v1.backup.model.RestoreStatus; import lombok.Builder; import lombok.Getter; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.backup.model.BackupRestoreResponse; -import technology.semi.weaviate.client.v1.backup.model.BackupRestoreStatusResponse; -import technology.semi.weaviate.client.v1.backup.model.RestoreStatus; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; public class BackupRestorer extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/model/Backend.java b/src/main/java/io/weaviate/client/v1/backup/model/Backend.java similarity index 70% rename from src/main/java/technology/semi/weaviate/client/v1/backup/model/Backend.java rename to src/main/java/io/weaviate/client/v1/backup/model/Backend.java index eb50796c7..173104c62 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/model/Backend.java +++ b/src/main/java/io/weaviate/client/v1/backup/model/Backend.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.backup.model; +package io.weaviate.client.v1.backup.model; public interface Backend { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupCreateResponse.java b/src/main/java/io/weaviate/client/v1/backup/model/BackupCreateResponse.java similarity index 88% rename from src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupCreateResponse.java rename to src/main/java/io/weaviate/client/v1/backup/model/BackupCreateResponse.java index fdea7cc97..a5a19877e 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupCreateResponse.java +++ b/src/main/java/io/weaviate/client/v1/backup/model/BackupCreateResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.backup.model; +package io.weaviate.client.v1.backup.model; import com.google.gson.annotations.SerializedName; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupCreateStatusResponse.java b/src/main/java/io/weaviate/client/v1/backup/model/BackupCreateStatusResponse.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupCreateStatusResponse.java rename to src/main/java/io/weaviate/client/v1/backup/model/BackupCreateStatusResponse.java index 80e5bab4c..38d72ef78 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupCreateStatusResponse.java +++ b/src/main/java/io/weaviate/client/v1/backup/model/BackupCreateStatusResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.backup.model; +package io.weaviate.client.v1.backup.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupRestoreResponse.java b/src/main/java/io/weaviate/client/v1/backup/model/BackupRestoreResponse.java similarity index 88% rename from src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupRestoreResponse.java rename to src/main/java/io/weaviate/client/v1/backup/model/BackupRestoreResponse.java index 961423b38..295639da4 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupRestoreResponse.java +++ b/src/main/java/io/weaviate/client/v1/backup/model/BackupRestoreResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.backup.model; +package io.weaviate.client.v1.backup.model; import com.google.gson.annotations.SerializedName; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupRestoreStatusResponse.java b/src/main/java/io/weaviate/client/v1/backup/model/BackupRestoreStatusResponse.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupRestoreStatusResponse.java rename to src/main/java/io/weaviate/client/v1/backup/model/BackupRestoreStatusResponse.java index afe4b563b..3facb6de6 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/model/BackupRestoreStatusResponse.java +++ b/src/main/java/io/weaviate/client/v1/backup/model/BackupRestoreStatusResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.backup.model; +package io.weaviate.client.v1.backup.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/model/CreateStatus.java b/src/main/java/io/weaviate/client/v1/backup/model/CreateStatus.java similarity index 77% rename from src/main/java/technology/semi/weaviate/client/v1/backup/model/CreateStatus.java rename to src/main/java/io/weaviate/client/v1/backup/model/CreateStatus.java index 0883527b1..9755e615f 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/model/CreateStatus.java +++ b/src/main/java/io/weaviate/client/v1/backup/model/CreateStatus.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.backup.model; +package io.weaviate.client.v1.backup.model; public interface CreateStatus { diff --git a/src/main/java/technology/semi/weaviate/client/v1/backup/model/RestoreStatus.java b/src/main/java/io/weaviate/client/v1/backup/model/RestoreStatus.java similarity index 78% rename from src/main/java/technology/semi/weaviate/client/v1/backup/model/RestoreStatus.java rename to src/main/java/io/weaviate/client/v1/backup/model/RestoreStatus.java index c1f8e91ac..c1957e1b1 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/backup/model/RestoreStatus.java +++ b/src/main/java/io/weaviate/client/v1/backup/model/RestoreStatus.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.backup.model; +package io.weaviate.client.v1.backup.model; public interface RestoreStatus { diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/Batch.java b/src/main/java/io/weaviate/client/v1/batch/Batch.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/batch/Batch.java rename to src/main/java/io/weaviate/client/v1/batch/Batch.java index c63834773..ce5d6f020 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/Batch.java +++ b/src/main/java/io/weaviate/client/v1/batch/Batch.java @@ -1,16 +1,16 @@ -package technology.semi.weaviate.client.v1.batch; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.util.BeaconPath; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.v1.batch.api.ReferencesBatcher; -import technology.semi.weaviate.client.v1.batch.api.ObjectsBatcher; -import technology.semi.weaviate.client.v1.batch.api.ObjectsBatchDeleter; -import technology.semi.weaviate.client.v1.batch.api.ReferencePayloadBuilder; -import technology.semi.weaviate.client.v1.batch.util.ObjectsPath; -import technology.semi.weaviate.client.v1.batch.util.ReferencesPath; -import technology.semi.weaviate.client.v1.data.Data; +package io.weaviate.client.v1.batch; + +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.util.BeaconPath; +import io.weaviate.client.base.util.DbVersionSupport; +import io.weaviate.client.v1.batch.api.ObjectsBatchDeleter; +import io.weaviate.client.v1.batch.api.ObjectsBatcher; +import io.weaviate.client.v1.batch.api.ReferencePayloadBuilder; +import io.weaviate.client.v1.batch.api.ReferencesBatcher; +import io.weaviate.client.v1.batch.util.ObjectsPath; +import io.weaviate.client.v1.batch.util.ReferencesPath; +import io.weaviate.client.Config; +import io.weaviate.client.v1.data.Data; public class Batch { private final Config config; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ObjectsBatchDeleter.java b/src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatchDeleter.java similarity index 79% rename from src/main/java/technology/semi/weaviate/client/v1/batch/api/ObjectsBatchDeleter.java rename to src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatchDeleter.java index 9cf545097..598505523 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ObjectsBatchDeleter.java +++ b/src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatchDeleter.java @@ -1,17 +1,17 @@ -package technology.semi.weaviate.client.v1.batch.api; +package io.weaviate.client.v1.batch.api; import com.google.gson.annotations.SerializedName; +import io.weaviate.client.v1.batch.model.BatchDeleteResponse; +import io.weaviate.client.v1.batch.util.ObjectsPath; import lombok.Builder; import lombok.Getter; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.batch.model.BatchDeleteResponse; -import technology.semi.weaviate.client.v1.batch.util.ObjectsPath; -import technology.semi.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.filters.WhereFilter; public class ObjectsBatchDeleter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ObjectsBatcher.java b/src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatcher.java similarity index 95% rename from src/main/java/technology/semi/weaviate/client/v1/batch/api/ObjectsBatcher.java rename to src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatcher.java index 19648e095..1c321719c 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ObjectsBatcher.java +++ b/src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatcher.java @@ -1,5 +1,8 @@ -package technology.semi.weaviate.client.v1.batch.api; +package io.weaviate.client.v1.batch.api; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.batch.model.ObjectsBatchRequestBody; +import io.weaviate.client.v1.batch.util.ObjectsPath; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -8,20 +11,17 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.tuple.Pair; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.util.Assert; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.batch.model.ObjectsBatchRequestBody; -import technology.semi.weaviate.client.v1.batch.util.ObjectsPath; -import technology.semi.weaviate.client.v1.data.Data; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.util.Assert; +import io.weaviate.client.v1.data.Data; +import io.weaviate.client.v1.data.model.WeaviateObject; import java.io.Closeable; import java.net.ConnectException; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ReferencePayloadBuilder.java b/src/main/java/io/weaviate/client/v1/batch/api/ReferencePayloadBuilder.java similarity index 92% rename from src/main/java/technology/semi/weaviate/client/v1/batch/api/ReferencePayloadBuilder.java rename to src/main/java/io/weaviate/client/v1/batch/api/ReferencePayloadBuilder.java index d9169ca2d..60d00d3d4 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ReferencePayloadBuilder.java +++ b/src/main/java/io/weaviate/client/v1/batch/api/ReferencePayloadBuilder.java @@ -1,8 +1,8 @@ -package technology.semi.weaviate.client.v1.batch.api; +package io.weaviate.client.v1.batch.api; +import io.weaviate.client.v1.batch.model.BatchReference; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.base.util.BeaconPath; -import technology.semi.weaviate.client.v1.batch.model.BatchReference; +import io.weaviate.client.base.util.BeaconPath; import java.util.Objects; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ReferencesBatcher.java b/src/main/java/io/weaviate/client/v1/batch/api/ReferencesBatcher.java similarity index 94% rename from src/main/java/technology/semi/weaviate/client/v1/batch/api/ReferencesBatcher.java rename to src/main/java/io/weaviate/client/v1/batch/api/ReferencesBatcher.java index 299e106ce..4428146b4 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/api/ReferencesBatcher.java +++ b/src/main/java/io/weaviate/client/v1/batch/api/ReferencesBatcher.java @@ -1,23 +1,23 @@ -package technology.semi.weaviate.client.v1.batch.api; +package io.weaviate.client.v1.batch.api; +import io.weaviate.client.v1.batch.model.BatchReference; +import io.weaviate.client.v1.batch.model.BatchReferenceResponse; +import io.weaviate.client.v1.batch.util.ReferencesPath; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.ObjectUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.util.Assert; -import technology.semi.weaviate.client.v1.batch.model.BatchReference; -import technology.semi.weaviate.client.v1.batch.model.BatchReferenceResponse; -import technology.semi.weaviate.client.v1.batch.util.ReferencesPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.util.Assert; import java.io.Closeable; import java.net.ConnectException; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteOutput.java b/src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteOutput.java similarity index 65% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteOutput.java rename to src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteOutput.java index 39385500e..6f07690b0 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteOutput.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteOutput.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; public interface BatchDeleteOutput { diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteResponse.java b/src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteResponse.java similarity index 92% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteResponse.java rename to src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteResponse.java index 08d6017e7..85e76af84 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteResponse.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import com.google.gson.annotations.SerializedName; import lombok.AccessLevel; @@ -6,7 +6,7 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.FieldDefaults; -import technology.semi.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.filters.WhereFilter; @Getter @Setter diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteResultStatus.java b/src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteResultStatus.java similarity index 71% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteResultStatus.java rename to src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteResultStatus.java index b48f73e03..142ee8f1e 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchDeleteResultStatus.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/BatchDeleteResultStatus.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; public interface BatchDeleteResultStatus { diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReference.java b/src/main/java/io/weaviate/client/v1/batch/model/BatchReference.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReference.java rename to src/main/java/io/weaviate/client/v1/batch/model/BatchReference.java index 1a27f4ba2..766e94577 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReference.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/BatchReference.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponse.java b/src/main/java/io/weaviate/client/v1/batch/model/BatchReferenceResponse.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponse.java rename to src/main/java/io/weaviate/client/v1/batch/model/BatchReferenceResponse.java index e54830d66..7c09a001c 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponse.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/BatchReferenceResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponseAO1Result.java b/src/main/java/io/weaviate/client/v1/batch/model/BatchReferenceResponseAO1Result.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponseAO1Result.java rename to src/main/java/io/weaviate/client/v1/batch/model/BatchReferenceResponseAO1Result.java index f8d7fca13..6f5b5cbde 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponseAO1Result.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/BatchReferenceResponseAO1Result.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectGetResponse.java b/src/main/java/io/weaviate/client/v1/batch/model/ObjectGetResponse.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectGetResponse.java rename to src/main/java/io/weaviate/client/v1/batch/model/ObjectGetResponse.java index b44cac2d2..ed5daa026 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectGetResponse.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/ObjectGetResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import com.google.gson.annotations.SerializedName; import lombok.AccessLevel; @@ -6,7 +6,7 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.FieldDefaults; -import technology.semi.weaviate.client.v1.data.model.Deprecation; +import io.weaviate.client.v1.data.model.Deprecation; import java.util.Map; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectsBatchRequestBody.java b/src/main/java/io/weaviate/client/v1/batch/model/ObjectsBatchRequestBody.java similarity index 70% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectsBatchRequestBody.java rename to src/main/java/io/weaviate/client/v1/batch/model/ObjectsBatchRequestBody.java index 4ced64dc2..e3c7693dd 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectsBatchRequestBody.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/ObjectsBatchRequestBody.java @@ -1,11 +1,11 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.ToString; import lombok.experimental.FieldDefaults; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.model.WeaviateObject; @Getter @Builder diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectsGetResponseAO2Result.java b/src/main/java/io/weaviate/client/v1/batch/model/ObjectsGetResponseAO2Result.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectsGetResponseAO2Result.java rename to src/main/java/io/weaviate/client/v1/batch/model/ObjectsGetResponseAO2Result.java index bd294740f..59c0cbade 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/model/ObjectsGetResponseAO2Result.java +++ b/src/main/java/io/weaviate/client/v1/batch/model/ObjectsGetResponseAO2Result.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/util/ObjectsPath.java b/src/main/java/io/weaviate/client/v1/batch/util/ObjectsPath.java similarity index 93% rename from src/main/java/technology/semi/weaviate/client/v1/batch/util/ObjectsPath.java rename to src/main/java/io/weaviate/client/v1/batch/util/ObjectsPath.java index c01b11590..7436841aa 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/util/ObjectsPath.java +++ b/src/main/java/io/weaviate/client/v1/batch/util/ObjectsPath.java @@ -1,11 +1,11 @@ -package technology.semi.weaviate.client.v1.batch.util; +package io.weaviate.client.v1.batch.util; import lombok.AccessLevel; import lombok.Builder; import lombok.ToString; import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.base.util.TriConsumer; +import io.weaviate.client.base.util.TriConsumer; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/technology/semi/weaviate/client/v1/batch/util/ReferencesPath.java b/src/main/java/io/weaviate/client/v1/batch/util/ReferencesPath.java similarity index 88% rename from src/main/java/technology/semi/weaviate/client/v1/batch/util/ReferencesPath.java rename to src/main/java/io/weaviate/client/v1/batch/util/ReferencesPath.java index bd67d203b..61a95246f 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/batch/util/ReferencesPath.java +++ b/src/main/java/io/weaviate/client/v1/batch/util/ReferencesPath.java @@ -1,12 +1,11 @@ -package technology.semi.weaviate.client.v1.batch.util; +package io.weaviate.client.v1.batch.util; import lombok.AccessLevel; import lombok.Builder; import lombok.ToString; import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.base.util.TriConsumer; +import io.weaviate.client.base.util.TriConsumer; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/Classifications.java b/src/main/java/io/weaviate/client/v1/classifications/Classifications.java similarity index 55% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/Classifications.java rename to src/main/java/io/weaviate/client/v1/classifications/Classifications.java index bdc1016a9..7547423f6 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/Classifications.java +++ b/src/main/java/io/weaviate/client/v1/classifications/Classifications.java @@ -1,9 +1,9 @@ -package technology.semi.weaviate.client.v1.classifications; +package io.weaviate.client.v1.classifications; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.classifications.api.Getter; -import technology.semi.weaviate.client.v1.classifications.api.Scheduler; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.classifications.api.Getter; +import io.weaviate.client.v1.classifications.api.Scheduler; +import io.weaviate.client.Config; public class Classifications { private final Config config; diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/api/Getter.java b/src/main/java/io/weaviate/client/v1/classifications/api/Getter.java similarity index 56% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/api/Getter.java rename to src/main/java/io/weaviate/client/v1/classifications/api/Getter.java index 5f02bd279..2339134a8 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/api/Getter.java +++ b/src/main/java/io/weaviate/client/v1/classifications/api/Getter.java @@ -1,13 +1,13 @@ -package technology.semi.weaviate.client.v1.classifications.api; +package io.weaviate.client.v1.classifications.api; +import io.weaviate.client.v1.classifications.model.Classification; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.classifications.model.Classification; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; public class Getter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/api/Scheduler.java b/src/main/java/io/weaviate/client/v1/classifications/api/Scheduler.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/api/Scheduler.java rename to src/main/java/io/weaviate/client/v1/classifications/api/Scheduler.java index 82c6d68a6..43c5928dd 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/api/Scheduler.java +++ b/src/main/java/io/weaviate/client/v1/classifications/api/Scheduler.java @@ -1,15 +1,15 @@ -package technology.semi.weaviate.client.v1.classifications.api; +package io.weaviate.client.v1.classifications.api; +import io.weaviate.client.v1.classifications.model.Classification; +import io.weaviate.client.v1.classifications.model.ClassificationFilters; import org.apache.commons.lang3.ObjectUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.classifications.model.Classification; -import technology.semi.weaviate.client.v1.classifications.model.ClassificationFilters; -import technology.semi.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.filters.WhereFilter; public class Scheduler extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/Classification.java b/src/main/java/io/weaviate/client/v1/classifications/model/Classification.java similarity index 89% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/model/Classification.java rename to src/main/java/io/weaviate/client/v1/classifications/model/Classification.java index ea495e7a5..1e4ebedf9 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/Classification.java +++ b/src/main/java/io/weaviate/client/v1/classifications/model/Classification.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.classifications.model; +package io.weaviate.client.v1.classifications.model; import com.google.gson.annotations.SerializedName; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationFilters.java b/src/main/java/io/weaviate/client/v1/classifications/model/ClassificationFilters.java similarity index 72% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationFilters.java rename to src/main/java/io/weaviate/client/v1/classifications/model/ClassificationFilters.java index d63ea8098..2da5955de 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationFilters.java +++ b/src/main/java/io/weaviate/client/v1/classifications/model/ClassificationFilters.java @@ -1,11 +1,11 @@ -package technology.semi.weaviate.client.v1.classifications.model; +package io.weaviate.client.v1.classifications.model; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.ToString; import lombok.experimental.FieldDefaults; -import technology.semi.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.filters.WhereFilter; @Getter @Builder diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationMeta.java b/src/main/java/io/weaviate/client/v1/classifications/model/ClassificationMeta.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationMeta.java rename to src/main/java/io/weaviate/client/v1/classifications/model/ClassificationMeta.java index e5f2afbdd..d99246952 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationMeta.java +++ b/src/main/java/io/weaviate/client/v1/classifications/model/ClassificationMeta.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.classifications.model; +package io.weaviate.client.v1.classifications.model; import java.util.Date; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationType.java b/src/main/java/io/weaviate/client/v1/classifications/model/ClassificationType.java similarity index 90% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationType.java rename to src/main/java/io/weaviate/client/v1/classifications/model/ClassificationType.java index e5f78d4e8..79abb5826 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ClassificationType.java +++ b/src/main/java/io/weaviate/client/v1/classifications/model/ClassificationType.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.classifications.model; +package io.weaviate.client.v1.classifications.model; public final class ClassificationType { // KNN (k nearest neighbours) a non parametric classification based on training data diff --git a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ParamsKNN.java b/src/main/java/io/weaviate/client/v1/classifications/model/ParamsKNN.java similarity index 79% rename from src/main/java/technology/semi/weaviate/client/v1/classifications/model/ParamsKNN.java rename to src/main/java/io/weaviate/client/v1/classifications/model/ParamsKNN.java index 82675ef52..d956cf1b4 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/classifications/model/ParamsKNN.java +++ b/src/main/java/io/weaviate/client/v1/classifications/model/ParamsKNN.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.classifications.model; +package io.weaviate.client.v1.classifications.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/cluster/Cluster.java b/src/main/java/io/weaviate/client/v1/cluster/Cluster.java similarity index 58% rename from src/main/java/technology/semi/weaviate/client/v1/cluster/Cluster.java rename to src/main/java/io/weaviate/client/v1/cluster/Cluster.java index 2da0f060c..5f2727994 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/cluster/Cluster.java +++ b/src/main/java/io/weaviate/client/v1/cluster/Cluster.java @@ -1,8 +1,8 @@ -package technology.semi.weaviate.client.v1.cluster; +package io.weaviate.client.v1.cluster; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.cluster.api.NodesStatusGetter; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.cluster.api.NodesStatusGetter; +import io.weaviate.client.Config; public class Cluster { diff --git a/src/main/java/io/weaviate/client/v1/cluster/api/NodesStatusGetter.java b/src/main/java/io/weaviate/client/v1/cluster/api/NodesStatusGetter.java new file mode 100644 index 000000000..0e7a5d4bd --- /dev/null +++ b/src/main/java/io/weaviate/client/v1/cluster/api/NodesStatusGetter.java @@ -0,0 +1,22 @@ +package io.weaviate.client.v1.cluster.api; + +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.cluster.model.NodesStatusResponse; + +public class NodesStatusGetter extends BaseClient implements ClientResult { + + public NodesStatusGetter(HttpClient httpClient, Config config) { + super(httpClient, config); + } + + @Override + public Result run() { + Response resp = sendGetRequest("/nodes", NodesStatusResponse.class); + return new Result<>(resp); + } +} diff --git a/src/main/java/technology/semi/weaviate/client/v1/cluster/model/NodesStatusResponse.java b/src/main/java/io/weaviate/client/v1/cluster/model/NodesStatusResponse.java similarity index 94% rename from src/main/java/technology/semi/weaviate/client/v1/cluster/model/NodesStatusResponse.java rename to src/main/java/io/weaviate/client/v1/cluster/model/NodesStatusResponse.java index 57ee3712b..13afd33b4 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/cluster/model/NodesStatusResponse.java +++ b/src/main/java/io/weaviate/client/v1/cluster/model/NodesStatusResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.cluster.model; +package io.weaviate.client.v1.cluster.model; import com.google.gson.annotations.SerializedName; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/Contextionary.java b/src/main/java/io/weaviate/client/v1/contextionary/Contextionary.java similarity index 57% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/Contextionary.java rename to src/main/java/io/weaviate/client/v1/contextionary/Contextionary.java index c960e27f7..c59331d76 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/Contextionary.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/Contextionary.java @@ -1,9 +1,9 @@ -package technology.semi.weaviate.client.v1.contextionary; +package io.weaviate.client.v1.contextionary; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.contextionary.api.ConceptsGetter; -import technology.semi.weaviate.client.v1.contextionary.api.ExtensionCreator; +import io.weaviate.client.v1.contextionary.api.ConceptsGetter; +import io.weaviate.client.v1.contextionary.api.ExtensionCreator; +import io.weaviate.client.Config; +import io.weaviate.client.base.http.HttpClient; public class Contextionary { private final Config config; diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/api/ConceptsGetter.java b/src/main/java/io/weaviate/client/v1/contextionary/api/ConceptsGetter.java similarity index 56% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/api/ConceptsGetter.java rename to src/main/java/io/weaviate/client/v1/contextionary/api/ConceptsGetter.java index 93d362bf4..cbb3a2919 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/api/ConceptsGetter.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/api/ConceptsGetter.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.contextionary.api; +package io.weaviate.client.v1.contextionary.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.contextionary.model.C11yWordsResponse; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.contextionary.model.C11yWordsResponse; public class ConceptsGetter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/api/ExtensionCreator.java b/src/main/java/io/weaviate/client/v1/contextionary/api/ExtensionCreator.java similarity index 71% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/api/ExtensionCreator.java rename to src/main/java/io/weaviate/client/v1/contextionary/api/ExtensionCreator.java index dd4734eb5..150e8d03b 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/api/ExtensionCreator.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/api/ExtensionCreator.java @@ -1,16 +1,16 @@ -package technology.semi.weaviate.client.v1.contextionary.api; +package io.weaviate.client.v1.contextionary.api; import java.util.stream.Collectors; import java.util.stream.Stream; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.contextionary.model.C11yExtension; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.contextionary.model.C11yExtension; public class ExtensionCreator extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yExtension.java b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yExtension.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yExtension.java rename to src/main/java/io/weaviate/client/v1/contextionary/model/C11yExtension.java index ae60ea337..b32c4303e 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yExtension.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yExtension.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.contextionary.model; +package io.weaviate.client.v1.contextionary.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yNearestNeighbor.java b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yNearestNeighbor.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yNearestNeighbor.java rename to src/main/java/io/weaviate/client/v1/contextionary/model/C11yNearestNeighbor.java index 97c7da6f7..ee9772df1 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yNearestNeighbor.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yNearestNeighbor.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.contextionary.model; +package io.weaviate.client.v1.contextionary.model; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponse.java b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponse.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponse.java rename to src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponse.java index 1fdf8c31f..274a72de0 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponse.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.contextionary.model; +package io.weaviate.client.v1.contextionary.model; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseConcatenatedWord.java b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseConcatenatedWord.java similarity index 86% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseConcatenatedWord.java rename to src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseConcatenatedWord.java index 34eb3d33e..36225ad7f 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseConcatenatedWord.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseConcatenatedWord.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.contextionary.model; +package io.weaviate.client.v1.contextionary.model; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems.java b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems.java rename to src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems.java index de205ad51..b25dde1ed 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.contextionary.model; +package io.weaviate.client.v1.contextionary.model; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems0Info.java b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems0Info.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems0Info.java rename to src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems0Info.java index e43ed8fbb..f2e1c9fb4 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems0Info.java +++ b/src/main/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseIndividualWordsItems0Info.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.contextionary.model; +package io.weaviate.client.v1.contextionary.model; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/Data.java b/src/main/java/io/weaviate/client/v1/data/Data.java similarity index 60% rename from src/main/java/technology/semi/weaviate/client/v1/data/Data.java rename to src/main/java/io/weaviate/client/v1/data/Data.java index 5252287a9..09da090d3 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/Data.java +++ b/src/main/java/io/weaviate/client/v1/data/Data.java @@ -1,21 +1,21 @@ -package technology.semi.weaviate.client.v1.data; +package io.weaviate.client.v1.data; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.api.ObjectCreator; -import technology.semi.weaviate.client.v1.data.api.ObjectDeleter; -import technology.semi.weaviate.client.v1.data.api.ObjectUpdater; -import technology.semi.weaviate.client.v1.data.api.ObjectValidator; -import technology.semi.weaviate.client.v1.data.api.ObjectsGetter; -import technology.semi.weaviate.client.v1.data.api.ReferenceCreator; -import technology.semi.weaviate.client.v1.data.api.ReferenceDeleter; -import technology.semi.weaviate.client.v1.data.api.ReferenceReplacer; -import technology.semi.weaviate.client.v1.data.builder.ReferencePayloadBuilder; -import technology.semi.weaviate.client.v1.data.api.ObjectsChecker; -import technology.semi.weaviate.client.base.util.BeaconPath; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.v1.data.util.ObjectsPath; -import technology.semi.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.util.BeaconPath; +import io.weaviate.client.base.util.DbVersionSupport; +import io.weaviate.client.v1.data.api.ObjectCreator; +import io.weaviate.client.v1.data.api.ObjectDeleter; +import io.weaviate.client.v1.data.api.ObjectUpdater; +import io.weaviate.client.v1.data.api.ObjectValidator; +import io.weaviate.client.v1.data.api.ObjectsChecker; +import io.weaviate.client.v1.data.api.ObjectsGetter; +import io.weaviate.client.v1.data.api.ReferenceCreator; +import io.weaviate.client.v1.data.api.ReferenceDeleter; +import io.weaviate.client.v1.data.api.ReferenceReplacer; +import io.weaviate.client.v1.data.builder.ReferencePayloadBuilder; +import io.weaviate.client.v1.data.util.ObjectsPath; +import io.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.Config; public class Data { private final Config config; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectCreator.java b/src/main/java/io/weaviate/client/v1/data/api/ObjectCreator.java similarity index 77% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectCreator.java rename to src/main/java/io/weaviate/client/v1/data/api/ObjectCreator.java index 1fd46a953..3d2f30b72 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectCreator.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ObjectCreator.java @@ -1,17 +1,17 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; +import io.weaviate.client.v1.data.util.ObjectsPath; import java.util.Map; import java.util.Objects; import java.util.UUID; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.util.ObjectsPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.data.model.WeaviateObject; public class ObjectCreator extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectDeleter.java b/src/main/java/io/weaviate/client/v1/data/api/ObjectDeleter.java similarity index 74% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectDeleter.java rename to src/main/java/io/weaviate/client/v1/data/api/ObjectDeleter.java index 93b1eadb1..7a9a5e4e1 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectDeleter.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ObjectDeleter.java @@ -1,18 +1,18 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; +import io.weaviate.client.v1.data.util.ObjectsPath; import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.util.ObjectsPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ObjectDeleter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectUpdater.java b/src/main/java/io/weaviate/client/v1/data/api/ObjectUpdater.java similarity index 78% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectUpdater.java rename to src/main/java/io/weaviate/client/v1/data/api/ObjectUpdater.java index abecf8bc7..041d9ab5c 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectUpdater.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ObjectUpdater.java @@ -1,21 +1,21 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.util.ObjectsPath; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.util.ObjectsPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ObjectUpdater extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectValidator.java b/src/main/java/io/weaviate/client/v1/data/api/ObjectValidator.java similarity index 72% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectValidator.java rename to src/main/java/io/weaviate/client/v1/data/api/ObjectValidator.java index 91e1e5d35..f1e527844 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectValidator.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ObjectValidator.java @@ -1,18 +1,18 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; +import io.weaviate.client.v1.data.model.WeaviateObject; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ObjectValidator extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectsChecker.java b/src/main/java/io/weaviate/client/v1/data/api/ObjectsChecker.java similarity index 71% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectsChecker.java rename to src/main/java/io/weaviate/client/v1/data/api/ObjectsChecker.java index c5e402092..8bbe4b6d2 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectsChecker.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ObjectsChecker.java @@ -1,18 +1,18 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; +import io.weaviate.client.v1.data.util.ObjectsPath; import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.util.ObjectsPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ObjectsChecker extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectsGetter.java b/src/main/java/io/weaviate/client/v1/data/api/ObjectsGetter.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectsGetter.java rename to src/main/java/io/weaviate/client/v1/data/api/ObjectsGetter.java index 9637b405c..f5474f037 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ObjectsGetter.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ObjectsGetter.java @@ -1,5 +1,6 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; +import io.weaviate.client.v1.data.util.ObjectsPath; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -7,15 +8,14 @@ import java.util.Objects; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.model.ObjectsListResponse; -import technology.semi.weaviate.client.v1.data.util.ObjectsPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.model.ObjectsListResponse; public class ObjectsGetter extends BaseClient implements ClientResult> { diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceCreator.java b/src/main/java/io/weaviate/client/v1/data/api/ReferenceCreator.java similarity index 75% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceCreator.java rename to src/main/java/io/weaviate/client/v1/data/api/ReferenceCreator.java index f8b5cd4b2..eb7713c80 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceCreator.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ReferenceCreator.java @@ -1,13 +1,13 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.model.SingleRef; -import technology.semi.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.v1.data.model.SingleRef; +import io.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; import java.util.Objects; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceDeleter.java b/src/main/java/io/weaviate/client/v1/data/api/ReferenceDeleter.java similarity index 75% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceDeleter.java rename to src/main/java/io/weaviate/client/v1/data/api/ReferenceDeleter.java index dd9c52d27..29196176f 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceDeleter.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ReferenceDeleter.java @@ -1,13 +1,13 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.model.SingleRef; -import technology.semi.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.v1.data.model.SingleRef; +import io.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; import java.util.Objects; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceReplacer.java b/src/main/java/io/weaviate/client/v1/data/api/ReferenceReplacer.java similarity index 76% rename from src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceReplacer.java rename to src/main/java/io/weaviate/client/v1/data/api/ReferenceReplacer.java index 6747b903b..dd3a49a31 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/api/ReferenceReplacer.java +++ b/src/main/java/io/weaviate/client/v1/data/api/ReferenceReplacer.java @@ -1,13 +1,13 @@ -package technology.semi.weaviate.client.v1.data.api; +package io.weaviate.client.v1.data.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.data.model.SingleRef; -import technology.semi.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.v1.data.model.SingleRef; +import io.weaviate.client.v1.data.util.ReferencesPath; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; import java.util.Objects; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/builder/ReferencePayloadBuilder.java b/src/main/java/io/weaviate/client/v1/data/builder/ReferencePayloadBuilder.java similarity index 86% rename from src/main/java/technology/semi/weaviate/client/v1/data/builder/ReferencePayloadBuilder.java rename to src/main/java/io/weaviate/client/v1/data/builder/ReferencePayloadBuilder.java index 9ef9d3a34..e24935202 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/builder/ReferencePayloadBuilder.java +++ b/src/main/java/io/weaviate/client/v1/data/builder/ReferencePayloadBuilder.java @@ -1,7 +1,7 @@ -package technology.semi.weaviate.client.v1.data.builder; +package io.weaviate.client.v1.data.builder; -import technology.semi.weaviate.client.v1.data.model.SingleRef; -import technology.semi.weaviate.client.base.util.BeaconPath; +import io.weaviate.client.v1.data.model.SingleRef; +import io.weaviate.client.base.util.BeaconPath; import java.util.Objects; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/model/Deprecation.java b/src/main/java/io/weaviate/client/v1/data/model/Deprecation.java similarity index 90% rename from src/main/java/technology/semi/weaviate/client/v1/data/model/Deprecation.java rename to src/main/java/io/weaviate/client/v1/data/model/Deprecation.java index fdc928943..2b80a39d5 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/model/Deprecation.java +++ b/src/main/java/io/weaviate/client/v1/data/model/Deprecation.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import java.util.Date; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/model/ObjectReference.java b/src/main/java/io/weaviate/client/v1/data/model/ObjectReference.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/data/model/ObjectReference.java rename to src/main/java/io/weaviate/client/v1/data/model/ObjectReference.java index 1eb00d967..160195d39 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/model/ObjectReference.java +++ b/src/main/java/io/weaviate/client/v1/data/model/ObjectReference.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/model/ObjectsListResponse.java b/src/main/java/io/weaviate/client/v1/data/model/ObjectsListResponse.java similarity index 86% rename from src/main/java/technology/semi/weaviate/client/v1/data/model/ObjectsListResponse.java rename to src/main/java/io/weaviate/client/v1/data/model/ObjectsListResponse.java index 7e2b218e6..61677b82d 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/model/ObjectsListResponse.java +++ b/src/main/java/io/weaviate/client/v1/data/model/ObjectsListResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/model/ReferenceMetaClassification.java b/src/main/java/io/weaviate/client/v1/data/model/ReferenceMetaClassification.java similarity index 90% rename from src/main/java/technology/semi/weaviate/client/v1/data/model/ReferenceMetaClassification.java rename to src/main/java/io/weaviate/client/v1/data/model/ReferenceMetaClassification.java index 0e81e1c35..191338910 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/model/ReferenceMetaClassification.java +++ b/src/main/java/io/weaviate/client/v1/data/model/ReferenceMetaClassification.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/model/SingleRef.java b/src/main/java/io/weaviate/client/v1/data/model/SingleRef.java similarity index 89% rename from src/main/java/technology/semi/weaviate/client/v1/data/model/SingleRef.java rename to src/main/java/io/weaviate/client/v1/data/model/SingleRef.java index 51542974f..b79d24b41 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/model/SingleRef.java +++ b/src/main/java/io/weaviate/client/v1/data/model/SingleRef.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import com.google.gson.annotations.SerializedName; import java.util.Map; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/model/WeaviateObject.java b/src/main/java/io/weaviate/client/v1/data/model/WeaviateObject.java similarity index 91% rename from src/main/java/technology/semi/weaviate/client/v1/data/model/WeaviateObject.java rename to src/main/java/io/weaviate/client/v1/data/model/WeaviateObject.java index c5d116d3e..a98c39784 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/model/WeaviateObject.java +++ b/src/main/java/io/weaviate/client/v1/data/model/WeaviateObject.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import com.google.gson.annotations.SerializedName; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/replication/model/ConsistencyLevel.java b/src/main/java/io/weaviate/client/v1/data/replication/model/ConsistencyLevel.java similarity index 62% rename from src/main/java/technology/semi/weaviate/client/v1/data/replication/model/ConsistencyLevel.java rename to src/main/java/io/weaviate/client/v1/data/replication/model/ConsistencyLevel.java index d7d987735..476d43f3e 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/replication/model/ConsistencyLevel.java +++ b/src/main/java/io/weaviate/client/v1/data/replication/model/ConsistencyLevel.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.replication.model; +package io.weaviate.client.v1.data.replication.model; public interface ConsistencyLevel { String ALL = "ALL"; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/util/ObjectsPath.java b/src/main/java/io/weaviate/client/v1/data/util/ObjectsPath.java similarity index 96% rename from src/main/java/technology/semi/weaviate/client/v1/data/util/ObjectsPath.java rename to src/main/java/io/weaviate/client/v1/data/util/ObjectsPath.java index 08c89cdb9..e56835d75 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/util/ObjectsPath.java +++ b/src/main/java/io/weaviate/client/v1/data/util/ObjectsPath.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.util; +package io.weaviate.client.v1.data.util; import lombok.AccessLevel; import lombok.Builder; @@ -6,8 +6,8 @@ import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.base.util.TriConsumer; +import io.weaviate.client.base.util.DbVersionSupport; +import io.weaviate.client.base.util.TriConsumer; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/technology/semi/weaviate/client/v1/data/util/ReferencesPath.java b/src/main/java/io/weaviate/client/v1/data/util/ReferencesPath.java similarity index 94% rename from src/main/java/technology/semi/weaviate/client/v1/data/util/ReferencesPath.java rename to src/main/java/io/weaviate/client/v1/data/util/ReferencesPath.java index d8882b13d..f26049a03 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/data/util/ReferencesPath.java +++ b/src/main/java/io/weaviate/client/v1/data/util/ReferencesPath.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.data.util; +package io.weaviate.client.v1.data.util; import lombok.AccessLevel; import lombok.Builder; import lombok.ToString; import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.base.util.TriConsumer; +import io.weaviate.client.base.util.DbVersionSupport; +import io.weaviate.client.base.util.TriConsumer; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/technology/semi/weaviate/client/v1/filters/Operator.java b/src/main/java/io/weaviate/client/v1/filters/Operator.java similarity index 88% rename from src/main/java/technology/semi/weaviate/client/v1/filters/Operator.java rename to src/main/java/io/weaviate/client/v1/filters/Operator.java index e5208233b..6fe4047d7 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/filters/Operator.java +++ b/src/main/java/io/weaviate/client/v1/filters/Operator.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.filters; +package io.weaviate.client.v1.filters; public interface Operator { diff --git a/src/main/java/technology/semi/weaviate/client/v1/filters/WhereFilter.java b/src/main/java/io/weaviate/client/v1/filters/WhereFilter.java similarity index 95% rename from src/main/java/technology/semi/weaviate/client/v1/filters/WhereFilter.java rename to src/main/java/io/weaviate/client/v1/filters/WhereFilter.java index 9514d5bda..37d2cf792 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/filters/WhereFilter.java +++ b/src/main/java/io/weaviate/client/v1/filters/WhereFilter.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.filters; +package io.weaviate.client.v1.filters; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/filters/WhereFilterUtil.java b/src/main/java/io/weaviate/client/v1/filters/WhereFilterUtil.java similarity index 98% rename from src/main/java/technology/semi/weaviate/client/v1/filters/WhereFilterUtil.java rename to src/main/java/io/weaviate/client/v1/filters/WhereFilterUtil.java index 62ca1fbce..d3cc02b53 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/filters/WhereFilterUtil.java +++ b/src/main/java/io/weaviate/client/v1/filters/WhereFilterUtil.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.filters; +package io.weaviate.client.v1.filters; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/GraphQL.java b/src/main/java/io/weaviate/client/v1/graphql/GraphQL.java similarity index 59% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/GraphQL.java rename to src/main/java/io/weaviate/client/v1/graphql/GraphQL.java index fc6af14e5..902980cc7 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/GraphQL.java +++ b/src/main/java/io/weaviate/client/v1/graphql/GraphQL.java @@ -1,20 +1,20 @@ -package technology.semi.weaviate.client.v1.graphql; +package io.weaviate.client.v1.graphql; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.graphql.query.Aggregate; -import technology.semi.weaviate.client.v1.graphql.query.Explore; -import technology.semi.weaviate.client.v1.graphql.query.Get; -import technology.semi.weaviate.client.v1.graphql.query.Raw; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.GroupArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.Bm25Argument; -import technology.semi.weaviate.client.v1.graphql.query.argument.HybridArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextMoveParameters; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortArgument; +import io.weaviate.client.v1.graphql.query.Aggregate; +import io.weaviate.client.v1.graphql.query.Explore; +import io.weaviate.client.v1.graphql.query.Get; +import io.weaviate.client.v1.graphql.query.Raw; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.Bm25Argument; +import io.weaviate.client.v1.graphql.query.argument.GroupArgument; +import io.weaviate.client.v1.graphql.query.argument.HybridArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextMoveParameters; +import io.weaviate.client.v1.graphql.query.argument.SortArgument; +import io.weaviate.client.Config; +import io.weaviate.client.base.http.HttpClient; public class GraphQL { private Config config; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/ExploreFields.java b/src/main/java/io/weaviate/client/v1/graphql/model/ExploreFields.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/model/ExploreFields.java rename to src/main/java/io/weaviate/client/v1/graphql/model/ExploreFields.java index 8e520f454..ed58ef7a0 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/ExploreFields.java +++ b/src/main/java/io/weaviate/client/v1/graphql/model/ExploreFields.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.model; +package io.weaviate.client.v1.graphql.model; public enum ExploreFields { CERTAINTY("certainty"), diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLError.java b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLError.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLError.java rename to src/main/java/io/weaviate/client/v1/graphql/model/GraphQLError.java index ed30691bc..5ba523b2b 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLError.java +++ b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLError.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.model; +package io.weaviate.client.v1.graphql.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLErrorLocationsItems.java b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLErrorLocationsItems.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLErrorLocationsItems.java rename to src/main/java/io/weaviate/client/v1/graphql/model/GraphQLErrorLocationsItems.java index 761ad99ac..126b59323 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLErrorLocationsItems.java +++ b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLErrorLocationsItems.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.model; +package io.weaviate.client.v1.graphql.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLQuery.java b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLQuery.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLQuery.java rename to src/main/java/io/weaviate/client/v1/graphql/model/GraphQLQuery.java index 282cf16b0..f46f731ae 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLQuery.java +++ b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLQuery.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.model; +package io.weaviate.client.v1.graphql.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLResponse.java b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLResponse.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLResponse.java rename to src/main/java/io/weaviate/client/v1/graphql/model/GraphQLResponse.java index 7ab0522e9..6e5e21840 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/model/GraphQLResponse.java +++ b/src/main/java/io/weaviate/client/v1/graphql/model/GraphQLResponse.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.model; +package io.weaviate.client.v1.graphql.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Aggregate.java b/src/main/java/io/weaviate/client/v1/graphql/query/Aggregate.java similarity index 62% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/Aggregate.java rename to src/main/java/io/weaviate/client/v1/graphql/query/Aggregate.java index 5e3d7c39b..8f389cb95 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Aggregate.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/Aggregate.java @@ -1,21 +1,21 @@ -package technology.semi.weaviate.client.v1.graphql.query; +package io.weaviate.client.v1.graphql.query; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLQuery; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLResponse; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.builder.AggregateBuilder; -import technology.semi.weaviate.client.v1.graphql.query.fields.Field; -import technology.semi.weaviate.client.v1.graphql.query.fields.Fields; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.builder.AggregateBuilder; +import io.weaviate.client.v1.graphql.query.fields.Field; +import io.weaviate.client.v1.graphql.query.fields.Fields; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.graphql.model.GraphQLQuery; +import io.weaviate.client.v1.graphql.model.GraphQLResponse; public class Aggregate extends BaseClient implements ClientResult { private final AggregateBuilder.AggregateBuilderBuilder aggregateBuilder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Explore.java b/src/main/java/io/weaviate/client/v1/graphql/query/Explore.java similarity index 60% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/Explore.java rename to src/main/java/io/weaviate/client/v1/graphql/query/Explore.java index 46180b5c6..cc77e9420 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Explore.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/Explore.java @@ -1,20 +1,20 @@ -package technology.semi.weaviate.client.v1.graphql.query; +package io.weaviate.client.v1.graphql.query; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.graphql.model.ExploreFields; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLQuery; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLResponse; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.builder.ExploreBuilder; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.builder.ExploreBuilder; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.graphql.model.ExploreFields; +import io.weaviate.client.v1.graphql.model.GraphQLQuery; +import io.weaviate.client.v1.graphql.model.GraphQLResponse; public class Explore extends BaseClient implements ClientResult { private final ExploreBuilder.ExploreBuilderBuilder exploreBuilder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Get.java b/src/main/java/io/weaviate/client/v1/graphql/query/Get.java similarity index 59% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/Get.java rename to src/main/java/io/weaviate/client/v1/graphql/query/Get.java index 99016e22a..3c2a3e244 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Get.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/Get.java @@ -1,28 +1,28 @@ -package technology.semi.weaviate.client.v1.graphql.query; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLQuery; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLResponse; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.GroupArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.Bm25Argument; -import technology.semi.weaviate.client.v1.graphql.query.argument.HybridArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortArguments; -import technology.semi.weaviate.client.v1.graphql.query.builder.GetBuilder; -import technology.semi.weaviate.client.v1.graphql.query.fields.Field; -import technology.semi.weaviate.client.v1.graphql.query.fields.Fields; -import technology.semi.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; +package io.weaviate.client.v1.graphql.query; + +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.Bm25Argument; +import io.weaviate.client.v1.graphql.query.argument.GroupArgument; +import io.weaviate.client.v1.graphql.query.argument.HybridArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.argument.SortArgument; +import io.weaviate.client.v1.graphql.query.argument.SortArguments; +import io.weaviate.client.v1.graphql.query.builder.GetBuilder; +import io.weaviate.client.v1.graphql.query.fields.Field; +import io.weaviate.client.v1.graphql.query.fields.Fields; +import io.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.graphql.model.GraphQLQuery; +import io.weaviate.client.v1.graphql.model.GraphQLResponse; public class Get extends BaseClient implements ClientResult { private final GetBuilder.GetBuilderBuilder getBuilder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Raw.java b/src/main/java/io/weaviate/client/v1/graphql/query/Raw.java similarity index 51% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/Raw.java rename to src/main/java/io/weaviate/client/v1/graphql/query/Raw.java index 50e7fd89c..2a3a37622 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/Raw.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/Raw.java @@ -1,13 +1,13 @@ -package technology.semi.weaviate.client.v1.graphql.query; +package io.weaviate.client.v1.graphql.query; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLQuery; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLResponse; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.graphql.model.GraphQLQuery; +import io.weaviate.client.v1.graphql.model.GraphQLResponse; diff --git a/src/main/java/io/weaviate/client/v1/graphql/query/argument/Argument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/Argument.java new file mode 100644 index 000000000..3889d7236 --- /dev/null +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/Argument.java @@ -0,0 +1,5 @@ +package io.weaviate.client.v1.graphql.query.argument; + +public interface Argument { + String build(); +} diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/AskArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/AskArgument.java similarity index 95% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/AskArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/AskArgument.java index 1a8e37da9..67c740146 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/AskArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/AskArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/Bm25Argument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/Bm25Argument.java similarity index 93% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/Bm25Argument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/Bm25Argument.java index 2f3ec11ed..f8dd286d8 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/Bm25Argument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/Bm25Argument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/GroupArgument.java similarity index 91% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/GroupArgument.java index 520dfc398..ad961991c 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/GroupArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupType.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/GroupType.java similarity index 76% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupType.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/GroupType.java index 85ab2f1a0..cebce68cf 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupType.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/GroupType.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; public enum GroupType { merge("merge"), diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/HybridArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/HybridArgument.java similarity index 92% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/HybridArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/HybridArgument.java index d177cf5f5..8b44d3a93 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/HybridArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/HybridArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearImageArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearImageArgument.java similarity index 96% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearImageArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/NearImageArgument.java index 8fba731fb..b9ad8aa82 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearImageArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearImageArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearObjectArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearObjectArgument.java similarity index 93% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearObjectArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/NearObjectArgument.java index d44398b94..8cc338edd 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearObjectArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearObjectArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearTextArgument.java similarity index 97% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/NearTextArgument.java index a5f08d094..46874de67 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearTextArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextMoveParameters.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearTextMoveParameters.java similarity index 88% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextMoveParameters.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/NearTextMoveParameters.java index ded8d3bc5..31b06c739 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextMoveParameters.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearTextMoveParameters.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearVectorArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearVectorArgument.java similarity index 93% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearVectorArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/NearVectorArgument.java index 3d85f3f61..84c6a1465 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearVectorArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/NearVectorArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgument.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/SortArgument.java similarity index 93% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgument.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/SortArgument.java index 901a0eb7c..da327c759 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgument.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/SortArgument.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArguments.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/SortArguments.java similarity index 90% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArguments.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/SortArguments.java index ceb9b73b3..fd5afc9f4 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArguments.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/SortArguments.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortOrder.java b/src/main/java/io/weaviate/client/v1/graphql/query/argument/SortOrder.java similarity index 75% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortOrder.java rename to src/main/java/io/weaviate/client/v1/graphql/query/argument/SortOrder.java index f15bd7e1f..35836d67f 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortOrder.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/argument/SortOrder.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; public enum SortOrder { asc("asc"), diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/AggregateBuilder.java b/src/main/java/io/weaviate/client/v1/graphql/query/builder/AggregateBuilder.java similarity index 78% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/AggregateBuilder.java rename to src/main/java/io/weaviate/client/v1/graphql/query/builder/AggregateBuilder.java index ceef83541..89e8b0904 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/AggregateBuilder.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/builder/AggregateBuilder.java @@ -1,5 +1,11 @@ -package technology.semi.weaviate.client.v1.graphql.query.builder; +package io.weaviate.client.v1.graphql.query.builder; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.fields.Fields; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -7,14 +13,8 @@ import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.client.v1.filters.WhereFilterUtil; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.fields.Fields; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.filters.WhereFilterUtil; import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/ExploreBuilder.java b/src/main/java/io/weaviate/client/v1/graphql/query/builder/ExploreBuilder.java similarity index 75% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/ExploreBuilder.java rename to src/main/java/io/weaviate/client/v1/graphql/query/builder/ExploreBuilder.java index 310220cb9..c66c8ee15 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/ExploreBuilder.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/builder/ExploreBuilder.java @@ -1,5 +1,10 @@ -package technology.semi.weaviate.client.v1.graphql.query.builder; +package io.weaviate.client.v1.graphql.query.builder; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; import java.util.LinkedHashSet; import java.util.Set; import lombok.AccessLevel; @@ -8,12 +13,7 @@ import lombok.ToString; import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.v1.graphql.model.ExploreFields; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.model.ExploreFields; @Getter @Builder diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/GetBuilder.java b/src/main/java/io/weaviate/client/v1/graphql/query/builder/GetBuilder.java similarity index 79% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/GetBuilder.java rename to src/main/java/io/weaviate/client/v1/graphql/query/builder/GetBuilder.java index 1df582815..dae02bdc0 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/GetBuilder.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/builder/GetBuilder.java @@ -1,5 +1,15 @@ -package technology.semi.weaviate.client.v1.graphql.query.builder; +package io.weaviate.client.v1.graphql.query.builder; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.Bm25Argument; +import io.weaviate.client.v1.graphql.query.argument.GroupArgument; +import io.weaviate.client.v1.graphql.query.argument.HybridArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.argument.SortArguments; +import io.weaviate.client.v1.graphql.query.fields.Fields; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -7,20 +17,10 @@ import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.client.v1.filters.WhereFilterUtil; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.Bm25Argument; -import technology.semi.weaviate.client.v1.graphql.query.argument.HybridArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.GroupArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortArguments; -import technology.semi.weaviate.client.v1.graphql.query.fields.Field; -import technology.semi.weaviate.client.v1.graphql.query.fields.Fields; -import technology.semi.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.filters.WhereFilterUtil; +import io.weaviate.client.v1.graphql.query.fields.Field; +import io.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/io/weaviate/client/v1/graphql/query/builder/Query.java b/src/main/java/io/weaviate/client/v1/graphql/query/builder/Query.java new file mode 100644 index 000000000..762c38e27 --- /dev/null +++ b/src/main/java/io/weaviate/client/v1/graphql/query/builder/Query.java @@ -0,0 +1,5 @@ +package io.weaviate.client.v1.graphql.query.builder; + +public interface Query { + String buildQuery(); +} diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/Field.java b/src/main/java/io/weaviate/client/v1/graphql/query/fields/Field.java similarity index 84% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/Field.java rename to src/main/java/io/weaviate/client/v1/graphql/query/fields/Field.java index 4a69dbd3e..95f716df6 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/Field.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/fields/Field.java @@ -1,5 +1,6 @@ -package technology.semi.weaviate.client.v1.graphql.query.fields; +package io.weaviate.client.v1.graphql.query.fields; +import io.weaviate.client.v1.graphql.query.argument.Argument; import java.util.Arrays; import lombok.AccessLevel; import lombok.Builder; @@ -8,7 +9,6 @@ import lombok.ToString; import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.v1.graphql.query.argument.Argument; @Getter @Builder diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/Fields.java b/src/main/java/io/weaviate/client/v1/graphql/query/fields/Fields.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/Fields.java rename to src/main/java/io/weaviate/client/v1/graphql/query/fields/Fields.java index 87a17a8d2..df85ee274 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/Fields.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/fields/Fields.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.fields; +package io.weaviate.client.v1.graphql.query.fields; import lombok.AccessLevel; import lombok.Builder; @@ -7,7 +7,7 @@ import lombok.ToString; import lombok.experimental.FieldDefaults; import org.apache.commons.lang3.ObjectUtils; -import technology.semi.weaviate.client.v1.graphql.query.argument.Argument; +import io.weaviate.client.v1.graphql.query.argument.Argument; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilder.java b/src/main/java/io/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilder.java similarity index 95% rename from src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilder.java rename to src/main/java/io/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilder.java index 4b2fa6dcd..59a35f911 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilder.java +++ b/src/main/java/io/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilder.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.fields; +package io.weaviate.client.v1.graphql.query.fields; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/Misc.java b/src/main/java/io/weaviate/client/v1/misc/Misc.java similarity index 61% rename from src/main/java/technology/semi/weaviate/client/v1/misc/Misc.java rename to src/main/java/io/weaviate/client/v1/misc/Misc.java index a7f523691..e4a580b12 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/Misc.java +++ b/src/main/java/io/weaviate/client/v1/misc/Misc.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.misc; +package io.weaviate.client.v1.misc; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.util.DbVersionProvider; -import technology.semi.weaviate.client.v1.misc.api.LiveChecker; -import technology.semi.weaviate.client.v1.misc.api.MetaGetter; -import technology.semi.weaviate.client.v1.misc.api.OpenIDConfigGetter; -import technology.semi.weaviate.client.v1.misc.api.ReadyChecker; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.util.DbVersionProvider; +import io.weaviate.client.v1.misc.api.LiveChecker; +import io.weaviate.client.v1.misc.api.MetaGetter; +import io.weaviate.client.v1.misc.api.OpenIDConfigGetter; +import io.weaviate.client.v1.misc.api.ReadyChecker; +import io.weaviate.client.Config; public class Misc { private final Config config; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/api/LiveChecker.java b/src/main/java/io/weaviate/client/v1/misc/api/LiveChecker.java similarity index 58% rename from src/main/java/technology/semi/weaviate/client/v1/misc/api/LiveChecker.java rename to src/main/java/io/weaviate/client/v1/misc/api/LiveChecker.java index b377951f9..382916642 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/api/LiveChecker.java +++ b/src/main/java/io/weaviate/client/v1/misc/api/LiveChecker.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.misc.api; +package io.weaviate.client.v1.misc.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.util.DbVersionProvider; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.util.DbVersionProvider; public class LiveChecker extends BaseClient implements ClientResult { diff --git a/src/main/java/io/weaviate/client/v1/misc/api/MetaGetter.java b/src/main/java/io/weaviate/client/v1/misc/api/MetaGetter.java new file mode 100644 index 000000000..0bbf3b40d --- /dev/null +++ b/src/main/java/io/weaviate/client/v1/misc/api/MetaGetter.java @@ -0,0 +1,22 @@ +package io.weaviate.client.v1.misc.api; + +import io.weaviate.client.v1.misc.model.Meta; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; + +public class MetaGetter extends BaseClient implements ClientResult { + + public MetaGetter(HttpClient httpClient, Config config) { + super(httpClient, config); + } + + @Override + public Result run() { + Response resp = sendGetRequest("/meta", Meta.class); + return new Result<>(resp); + } +} diff --git a/src/main/java/io/weaviate/client/v1/misc/api/OpenIDConfigGetter.java b/src/main/java/io/weaviate/client/v1/misc/api/OpenIDConfigGetter.java new file mode 100644 index 000000000..bcaa2341a --- /dev/null +++ b/src/main/java/io/weaviate/client/v1/misc/api/OpenIDConfigGetter.java @@ -0,0 +1,22 @@ +package io.weaviate.client.v1.misc.api; + +import io.weaviate.client.v1.misc.model.OpenIDConfiguration; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; + +public class OpenIDConfigGetter extends BaseClient implements ClientResult { + + public OpenIDConfigGetter(HttpClient httpClient, Config config) { + super(httpClient, config); + } + + @Override + public Result run() { + Response resp = sendGetRequest("/.well-known/openid-configuration", OpenIDConfiguration.class); + return new Result<>(resp); + } +} diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/api/ReadyChecker.java b/src/main/java/io/weaviate/client/v1/misc/api/ReadyChecker.java similarity index 58% rename from src/main/java/technology/semi/weaviate/client/v1/misc/api/ReadyChecker.java rename to src/main/java/io/weaviate/client/v1/misc/api/ReadyChecker.java index f8baf2e50..1f6e3a2e8 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/api/ReadyChecker.java +++ b/src/main/java/io/weaviate/client/v1/misc/api/ReadyChecker.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.misc.api; +package io.weaviate.client.v1.misc.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.base.util.DbVersionProvider; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.base.util.DbVersionProvider; public class ReadyChecker extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/BM25Config.java b/src/main/java/io/weaviate/client/v1/misc/model/BM25Config.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/BM25Config.java rename to src/main/java/io/weaviate/client/v1/misc/model/BM25Config.java index 1b7f2b58b..927941d9e 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/BM25Config.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/BM25Config.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/DistanceType.java b/src/main/java/io/weaviate/client/v1/misc/model/DistanceType.java similarity index 77% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/DistanceType.java rename to src/main/java/io/weaviate/client/v1/misc/model/DistanceType.java index 98211e995..80e53cdd7 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/DistanceType.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/DistanceType.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; public interface DistanceType { diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/InvertedIndexConfig.java b/src/main/java/io/weaviate/client/v1/misc/model/InvertedIndexConfig.java similarity index 87% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/InvertedIndexConfig.java rename to src/main/java/io/weaviate/client/v1/misc/model/InvertedIndexConfig.java index 69632aade..1b63ebefe 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/InvertedIndexConfig.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/InvertedIndexConfig.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/Meta.java b/src/main/java/io/weaviate/client/v1/misc/model/Meta.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/Meta.java rename to src/main/java/io/weaviate/client/v1/misc/model/Meta.java index 920831a64..edb053292 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/Meta.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/Meta.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/OpenIDConfiguration.java b/src/main/java/io/weaviate/client/v1/misc/model/OpenIDConfiguration.java similarity index 81% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/OpenIDConfiguration.java rename to src/main/java/io/weaviate/client/v1/misc/model/OpenIDConfiguration.java index 34f423577..28bda6235 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/OpenIDConfiguration.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/OpenIDConfiguration.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/PQConfig.java b/src/main/java/io/weaviate/client/v1/misc/model/PQConfig.java similarity index 90% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/PQConfig.java rename to src/main/java/io/weaviate/client/v1/misc/model/PQConfig.java index fc8f667ad..413a6f5af 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/PQConfig.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/PQConfig.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/ReplicationConfig.java b/src/main/java/io/weaviate/client/v1/misc/model/ReplicationConfig.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/ReplicationConfig.java rename to src/main/java/io/weaviate/client/v1/misc/model/ReplicationConfig.java index 1e7c023a6..0200021be 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/ReplicationConfig.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/ReplicationConfig.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/ShardingConfig.java b/src/main/java/io/weaviate/client/v1/misc/model/ShardingConfig.java similarity index 89% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/ShardingConfig.java rename to src/main/java/io/weaviate/client/v1/misc/model/ShardingConfig.java index e581e44f1..6b52abbd0 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/ShardingConfig.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/ShardingConfig.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/StopwordConfig.java b/src/main/java/io/weaviate/client/v1/misc/model/StopwordConfig.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/StopwordConfig.java rename to src/main/java/io/weaviate/client/v1/misc/model/StopwordConfig.java index b11150c2c..f9fe3548d 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/StopwordConfig.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/StopwordConfig.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/model/VectorIndexConfig.java b/src/main/java/io/weaviate/client/v1/misc/model/VectorIndexConfig.java similarity index 90% rename from src/main/java/technology/semi/weaviate/client/v1/misc/model/VectorIndexConfig.java rename to src/main/java/io/weaviate/client/v1/misc/model/VectorIndexConfig.java index 0e41a1f73..220b2b633 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/model/VectorIndexConfig.java +++ b/src/main/java/io/weaviate/client/v1/misc/model/VectorIndexConfig.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.misc.model; +package io.weaviate.client.v1.misc.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/Schema.java b/src/main/java/io/weaviate/client/v1/schema/Schema.java similarity index 59% rename from src/main/java/technology/semi/weaviate/client/v1/schema/Schema.java rename to src/main/java/io/weaviate/client/v1/schema/Schema.java index 795753fa7..9c2a244c8 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/Schema.java +++ b/src/main/java/io/weaviate/client/v1/schema/Schema.java @@ -1,16 +1,16 @@ -package technology.semi.weaviate.client.v1.schema; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.api.ClassCreator; -import technology.semi.weaviate.client.v1.schema.api.ClassDeleter; -import technology.semi.weaviate.client.v1.schema.api.ClassGetter; -import technology.semi.weaviate.client.v1.schema.api.PropertyCreator; -import technology.semi.weaviate.client.v1.schema.api.SchemaDeleter; -import technology.semi.weaviate.client.v1.schema.api.SchemaGetter; -import technology.semi.weaviate.client.v1.schema.api.ShardUpdater; -import technology.semi.weaviate.client.v1.schema.api.ShardsGetter; -import technology.semi.weaviate.client.v1.schema.api.ShardsUpdater; +package io.weaviate.client.v1.schema; + +import io.weaviate.client.base.http.HttpClient; +import io.weaviate.client.v1.schema.api.ClassCreator; +import io.weaviate.client.v1.schema.api.ClassDeleter; +import io.weaviate.client.v1.schema.api.ClassGetter; +import io.weaviate.client.v1.schema.api.PropertyCreator; +import io.weaviate.client.v1.schema.api.SchemaDeleter; +import io.weaviate.client.v1.schema.api.SchemaGetter; +import io.weaviate.client.v1.schema.api.ShardUpdater; +import io.weaviate.client.v1.schema.api.ShardsGetter; +import io.weaviate.client.v1.schema.api.ShardsUpdater; +import io.weaviate.client.Config; public class Schema { private final Config config; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassCreator.java b/src/main/java/io/weaviate/client/v1/schema/api/ClassCreator.java similarity index 55% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassCreator.java rename to src/main/java/io/weaviate/client/v1/schema/api/ClassCreator.java index 417843a09..96b51c389 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassCreator.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/ClassCreator.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; +import io.weaviate.client.v1.schema.model.WeaviateClass; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; public class ClassCreator extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassDeleter.java b/src/main/java/io/weaviate/client/v1/schema/api/ClassDeleter.java similarity index 68% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassDeleter.java rename to src/main/java/io/weaviate/client/v1/schema/api/ClassDeleter.java index 830bc62af..692cc373a 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassDeleter.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/ClassDeleter.java @@ -1,16 +1,16 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ClassDeleter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassGetter.java b/src/main/java/io/weaviate/client/v1/schema/api/ClassGetter.java similarity index 64% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassGetter.java rename to src/main/java/io/weaviate/client/v1/schema/api/ClassGetter.java index 0a559107f..18ee283c6 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ClassGetter.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/ClassGetter.java @@ -1,17 +1,17 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; +import io.weaviate.client.v1.schema.model.WeaviateClass; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ClassGetter extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/PropertyCreator.java b/src/main/java/io/weaviate/client/v1/schema/api/PropertyCreator.java similarity index 68% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/PropertyCreator.java rename to src/main/java/io/weaviate/client/v1/schema/api/PropertyCreator.java index eb55ff886..625284022 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/PropertyCreator.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/PropertyCreator.java @@ -1,17 +1,17 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; +import io.weaviate.client.v1.schema.model.Property; import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.model.Property; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class PropertyCreator extends BaseClient implements ClientResult { diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/SchemaDeleter.java b/src/main/java/io/weaviate/client/v1/schema/api/SchemaDeleter.java similarity index 77% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/SchemaDeleter.java rename to src/main/java/io/weaviate/client/v1/schema/api/SchemaDeleter.java index de9ffcbc5..0c5c48412 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/SchemaDeleter.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/SchemaDeleter.java @@ -1,12 +1,12 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; +import io.weaviate.client.v1.schema.model.Schema; +import io.weaviate.client.v1.schema.model.WeaviateClass; import java.util.List; import java.util.stream.Collectors; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; -import technology.semi.weaviate.client.v1.schema.model.Schema; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; public class SchemaDeleter { private SchemaGetter schemaGetter; diff --git a/src/main/java/io/weaviate/client/v1/schema/api/SchemaGetter.java b/src/main/java/io/weaviate/client/v1/schema/api/SchemaGetter.java new file mode 100644 index 000000000..0dd1f34f0 --- /dev/null +++ b/src/main/java/io/weaviate/client/v1/schema/api/SchemaGetter.java @@ -0,0 +1,22 @@ +package io.weaviate.client.v1.schema.api; + +import io.weaviate.client.v1.schema.model.Schema; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.http.HttpClient; + +public class SchemaGetter extends BaseClient implements ClientResult { + + public SchemaGetter(HttpClient httpClient, Config config) { + super(httpClient, config); + } + + @Override + public Result run() { + Response resp = sendGetRequest("/schema", Schema.class); + return new Result<>(resp); + } +} diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardUpdater.java b/src/main/java/io/weaviate/client/v1/schema/api/ShardUpdater.java similarity index 76% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardUpdater.java rename to src/main/java/io/weaviate/client/v1/schema/api/ShardUpdater.java index 12021f5fe..d6bf49d5a 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardUpdater.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/ShardUpdater.java @@ -1,19 +1,19 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; +import io.weaviate.client.v1.schema.model.ShardStatus; import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.model.ShardStatus; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ShardUpdater extends BaseClient implements ClientResult { private String className; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardsGetter.java b/src/main/java/io/weaviate/client/v1/schema/api/ShardsGetter.java similarity index 61% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardsGetter.java rename to src/main/java/io/weaviate/client/v1/schema/api/ShardsGetter.java index 7282dd2d9..7c4c7e975 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardsGetter.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/ShardsGetter.java @@ -1,19 +1,17 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; +import io.weaviate.client.v1.schema.model.Shard; import java.util.Collections; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.model.Shard; +import io.weaviate.client.Config; +import io.weaviate.client.base.BaseClient; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Response; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ShardsGetter extends BaseClient implements ClientResult { private String className; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardsUpdater.java b/src/main/java/io/weaviate/client/v1/schema/api/ShardsUpdater.java similarity index 80% rename from src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardsUpdater.java rename to src/main/java/io/weaviate/client/v1/schema/api/ShardsUpdater.java index 438dec1dc..c4fff149d 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/ShardsUpdater.java +++ b/src/main/java/io/weaviate/client/v1/schema/api/ShardsUpdater.java @@ -1,19 +1,19 @@ -package technology.semi.weaviate.client.v1.schema.api; +package io.weaviate.client.v1.schema.api; +import io.weaviate.client.v1.schema.model.Shard; +import io.weaviate.client.v1.schema.model.ShardStatus; import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateError; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.base.WeaviateErrorResponse; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.model.Shard; -import technology.semi.weaviate.client.v1.schema.model.ShardStatus; +import io.weaviate.client.Config; +import io.weaviate.client.base.ClientResult; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateError; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.base.WeaviateErrorResponse; +import io.weaviate.client.base.http.HttpClient; public class ShardsUpdater implements ClientResult { private final ShardsGetter shardsGetter; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/DataType.java b/src/main/java/io/weaviate/client/v1/schema/model/DataType.java similarity index 89% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/DataType.java rename to src/main/java/io/weaviate/client/v1/schema/model/DataType.java index 7519ab44f..db1d13e27 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/DataType.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/DataType.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; public interface DataType { String CREF = "cref"; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Property.java b/src/main/java/io/weaviate/client/v1/schema/model/Property.java similarity index 87% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/Property.java rename to src/main/java/io/weaviate/client/v1/schema/model/Property.java index 0062c71cf..87f199bee 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Property.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/Property.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; import java.util.List; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Schema.java b/src/main/java/io/weaviate/client/v1/schema/model/Schema.java similarity index 85% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/Schema.java rename to src/main/java/io/weaviate/client/v1/schema/model/Schema.java index a936c4a48..b0108b65c 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Schema.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/Schema.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; import java.util.List; import lombok.AccessLevel; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Shard.java b/src/main/java/io/weaviate/client/v1/schema/model/Shard.java similarity index 83% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/Shard.java rename to src/main/java/io/weaviate/client/v1/schema/model/Shard.java index f2167e728..2ba877506 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Shard.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/Shard.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/ShardStatus.java b/src/main/java/io/weaviate/client/v1/schema/model/ShardStatus.java similarity index 82% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/ShardStatus.java rename to src/main/java/io/weaviate/client/v1/schema/model/ShardStatus.java index 5a7ee5d72..24c79cba5 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/ShardStatus.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/ShardStatus.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/ShardStatuses.java b/src/main/java/io/weaviate/client/v1/schema/model/ShardStatuses.java similarity index 62% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/ShardStatuses.java rename to src/main/java/io/weaviate/client/v1/schema/model/ShardStatuses.java index 646ad8512..1e9d58f9a 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/ShardStatuses.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/ShardStatuses.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; public interface ShardStatuses { String READONLY = "READONLY"; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Tokenization.java b/src/main/java/io/weaviate/client/v1/schema/model/Tokenization.java similarity index 59% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/Tokenization.java rename to src/main/java/io/weaviate/client/v1/schema/model/Tokenization.java index 56b0b98d9..ac7c693c3 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/Tokenization.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/Tokenization.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; public interface Tokenization { String WORD = "word"; diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/model/WeaviateClass.java b/src/main/java/io/weaviate/client/v1/schema/model/WeaviateClass.java similarity index 72% rename from src/main/java/technology/semi/weaviate/client/v1/schema/model/WeaviateClass.java rename to src/main/java/io/weaviate/client/v1/schema/model/WeaviateClass.java index d746a8175..f1f0dc440 100644 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/model/WeaviateClass.java +++ b/src/main/java/io/weaviate/client/v1/schema/model/WeaviateClass.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; import com.google.gson.annotations.SerializedName; import java.util.List; @@ -7,10 +7,10 @@ import lombok.Getter; import lombok.ToString; import lombok.experimental.FieldDefaults; -import technology.semi.weaviate.client.v1.misc.model.InvertedIndexConfig; -import technology.semi.weaviate.client.v1.misc.model.ReplicationConfig; -import technology.semi.weaviate.client.v1.misc.model.ShardingConfig; -import technology.semi.weaviate.client.v1.misc.model.VectorIndexConfig; +import io.weaviate.client.v1.misc.model.InvertedIndexConfig; +import io.weaviate.client.v1.misc.model.ReplicationConfig; +import io.weaviate.client.v1.misc.model.ShardingConfig; +import io.weaviate.client.v1.misc.model.VectorIndexConfig; @Getter @Builder diff --git a/src/main/java/technology/semi/weaviate/client/v1/auth/Authentication.java b/src/main/java/technology/semi/weaviate/client/v1/auth/Authentication.java deleted file mode 100644 index 44043e58d..000000000 --- a/src/main/java/technology/semi/weaviate/client/v1/auth/Authentication.java +++ /dev/null @@ -1,11 +0,0 @@ -package technology.semi.weaviate.client.v1.auth; - -import java.util.List; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; - -public interface Authentication { - WeaviateClient getAuthClient(Config config, List scopes) throws AuthException; - WeaviateClient getAuthClient(Config config) throws AuthException; -} diff --git a/src/main/java/technology/semi/weaviate/client/v1/cluster/api/NodesStatusGetter.java b/src/main/java/technology/semi/weaviate/client/v1/cluster/api/NodesStatusGetter.java deleted file mode 100644 index 74fa4ff13..000000000 --- a/src/main/java/technology/semi/weaviate/client/v1/cluster/api/NodesStatusGetter.java +++ /dev/null @@ -1,22 +0,0 @@ -package technology.semi.weaviate.client.v1.cluster.api; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.cluster.model.NodesStatusResponse; - -public class NodesStatusGetter extends BaseClient implements ClientResult { - - public NodesStatusGetter(HttpClient httpClient, Config config) { - super(httpClient, config); - } - - @Override - public Result run() { - Response resp = sendGetRequest("/nodes", NodesStatusResponse.class); - return new Result<>(resp); - } -} diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/Argument.java b/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/Argument.java deleted file mode 100644 index b454da9ba..000000000 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/argument/Argument.java +++ /dev/null @@ -1,5 +0,0 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; - -public interface Argument { - String build(); -} diff --git a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/Query.java b/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/Query.java deleted file mode 100644 index c8e6b930d..000000000 --- a/src/main/java/technology/semi/weaviate/client/v1/graphql/query/builder/Query.java +++ /dev/null @@ -1,5 +0,0 @@ -package technology.semi.weaviate.client.v1.graphql.query.builder; - -public interface Query { - String buildQuery(); -} diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/api/MetaGetter.java b/src/main/java/technology/semi/weaviate/client/v1/misc/api/MetaGetter.java deleted file mode 100644 index ea0cc20aa..000000000 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/api/MetaGetter.java +++ /dev/null @@ -1,22 +0,0 @@ -package technology.semi.weaviate.client.v1.misc.api; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.misc.model.Meta; - -public class MetaGetter extends BaseClient implements ClientResult { - - public MetaGetter(HttpClient httpClient, Config config) { - super(httpClient, config); - } - - @Override - public Result run() { - Response resp = sendGetRequest("/meta", Meta.class); - return new Result<>(resp); - } -} diff --git a/src/main/java/technology/semi/weaviate/client/v1/misc/api/OpenIDConfigGetter.java b/src/main/java/technology/semi/weaviate/client/v1/misc/api/OpenIDConfigGetter.java deleted file mode 100644 index 487ecef61..000000000 --- a/src/main/java/technology/semi/weaviate/client/v1/misc/api/OpenIDConfigGetter.java +++ /dev/null @@ -1,22 +0,0 @@ -package technology.semi.weaviate.client.v1.misc.api; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.misc.model.OpenIDConfiguration; - -public class OpenIDConfigGetter extends BaseClient implements ClientResult { - - public OpenIDConfigGetter(HttpClient httpClient, Config config) { - super(httpClient, config); - } - - @Override - public Result run() { - Response resp = sendGetRequest("/.well-known/openid-configuration", OpenIDConfiguration.class); - return new Result<>(resp); - } -} diff --git a/src/main/java/technology/semi/weaviate/client/v1/schema/api/SchemaGetter.java b/src/main/java/technology/semi/weaviate/client/v1/schema/api/SchemaGetter.java deleted file mode 100644 index c250cc219..000000000 --- a/src/main/java/technology/semi/weaviate/client/v1/schema/api/SchemaGetter.java +++ /dev/null @@ -1,22 +0,0 @@ -package technology.semi.weaviate.client.v1.schema.api; - -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.base.BaseClient; -import technology.semi.weaviate.client.base.ClientResult; -import technology.semi.weaviate.client.base.Response; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.http.HttpClient; -import technology.semi.weaviate.client.v1.schema.model.Schema; - -public class SchemaGetter extends BaseClient implements ClientResult { - - public SchemaGetter(HttpClient httpClient, Config config) { - super(httpClient, config); - } - - @Override - public Result run() { - Response resp = sendGetRequest("/schema", Schema.class); - return new Result<>(resp); - } -} diff --git a/src/test/java/technology/semi/weaviate/client/ConfigTest.java b/src/test/java/io/weaviate/client/ConfigTest.java similarity index 79% rename from src/test/java/technology/semi/weaviate/client/ConfigTest.java rename to src/test/java/io/weaviate/client/ConfigTest.java index 9fa951fc1..e0f6c5aa8 100644 --- a/src/test/java/technology/semi/weaviate/client/ConfigTest.java +++ b/src/test/java/io/weaviate/client/ConfigTest.java @@ -1,14 +1,10 @@ -package technology.semi.weaviate.client; +package io.weaviate.client; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import junit.framework.TestCase; import org.junit.Assert; import org.junit.Test; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; public class ConfigTest extends TestCase { @Test diff --git a/src/test/java/technology/semi/weaviate/client/WeaviateAuthClientTest.java b/src/test/java/io/weaviate/client/WeaviateAuthClientTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/client/WeaviateAuthClientTest.java rename to src/test/java/io/weaviate/client/WeaviateAuthClientTest.java index ee95f6834..353fef67f 100644 --- a/src/test/java/technology/semi/weaviate/client/WeaviateAuthClientTest.java +++ b/src/test/java/io/weaviate/client/WeaviateAuthClientTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client; +package io.weaviate.client; import junit.framework.TestCase; import org.junit.After; @@ -10,7 +10,7 @@ import static org.mockserver.model.HttpRequest.request; import static org.mockserver.model.HttpResponse.response; import org.mockserver.verify.VerificationTimes; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.auth.exception.AuthException; public class WeaviateAuthClientTest extends TestCase { diff --git a/src/test/java/technology/semi/weaviate/client/base/SerializerTest.java b/src/test/java/io/weaviate/client/base/SerializerTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/client/base/SerializerTest.java rename to src/test/java/io/weaviate/client/base/SerializerTest.java index f1d76b0bf..a7f2dd826 100644 --- a/src/test/java/technology/semi/weaviate/client/base/SerializerTest.java +++ b/src/test/java/io/weaviate/client/base/SerializerTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base; +package io.weaviate.client.base; import junit.framework.TestCase; import org.junit.Assert; @@ -70,4 +70,4 @@ public TestObj(String description) { public String getDescription() { return description; } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/base/http/impl/CommonsHttpClientImplTest.java b/src/test/java/io/weaviate/client/base/http/impl/CommonsHttpClientImplTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/client/base/http/impl/CommonsHttpClientImplTest.java rename to src/test/java/io/weaviate/client/base/http/impl/CommonsHttpClientImplTest.java index 3385ee5e4..6914cdcb1 100644 --- a/src/test/java/technology/semi/weaviate/client/base/http/impl/CommonsHttpClientImplTest.java +++ b/src/test/java/io/weaviate/client/base/http/impl/CommonsHttpClientImplTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.http.impl; +package io.weaviate.client.base.http.impl; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.HttpHeaders; @@ -21,7 +21,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; -import technology.semi.weaviate.client.base.http.HttpResponse; +import io.weaviate.client.base.http.HttpResponse; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/test/java/technology/semi/weaviate/client/base/util/BeaconPathTest.java b/src/test/java/io/weaviate/client/base/util/BeaconPathTest.java similarity index 99% rename from src/test/java/technology/semi/weaviate/client/base/util/BeaconPathTest.java rename to src/test/java/io/weaviate/client/base/util/BeaconPathTest.java index 1342d2211..d35f2732f 100644 --- a/src/test/java/technology/semi/weaviate/client/base/util/BeaconPathTest.java +++ b/src/test/java/io/weaviate/client/base/util/BeaconPathTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; diff --git a/src/test/java/technology/semi/weaviate/client/base/util/DbVersionProviderTest.java b/src/test/java/io/weaviate/client/base/util/DbVersionProviderTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/client/base/util/DbVersionProviderTest.java rename to src/test/java/io/weaviate/client/base/util/DbVersionProviderTest.java index 0b63253cd..79d178fd5 100644 --- a/src/test/java/technology/semi/weaviate/client/base/util/DbVersionProviderTest.java +++ b/src/test/java/io/weaviate/client/base/util/DbVersionProviderTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/technology/semi/weaviate/client/base/util/DbVersionSupportTest.java b/src/test/java/io/weaviate/client/base/util/DbVersionSupportTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/client/base/util/DbVersionSupportTest.java rename to src/test/java/io/weaviate/client/base/util/DbVersionSupportTest.java index 663b24bc1..7e4fa9d1d 100644 --- a/src/test/java/technology/semi/weaviate/client/base/util/DbVersionSupportTest.java +++ b/src/test/java/io/weaviate/client/base/util/DbVersionSupportTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.base.util; +package io.weaviate.client.base.util; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; diff --git a/src/test/java/technology/semi/weaviate/client/v1/auth/provider/AccessTokenProviderTest.java b/src/test/java/io/weaviate/client/v1/auth/provider/AccessTokenProviderTest.java similarity index 96% rename from src/test/java/technology/semi/weaviate/client/v1/auth/provider/AccessTokenProviderTest.java rename to src/test/java/io/weaviate/client/v1/auth/provider/AccessTokenProviderTest.java index cd0e23b29..b9ab41bf0 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/auth/provider/AccessTokenProviderTest.java +++ b/src/test/java/io/weaviate/client/v1/auth/provider/AccessTokenProviderTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.auth.provider; +package io.weaviate.client.v1.auth.provider; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/test/java/technology/semi/weaviate/client/v1/batch/api/ReferencePayloadBuilderTest.java b/src/test/java/io/weaviate/client/v1/batch/api/ReferencePayloadBuilderTest.java similarity index 91% rename from src/test/java/technology/semi/weaviate/client/v1/batch/api/ReferencePayloadBuilderTest.java rename to src/test/java/io/weaviate/client/v1/batch/api/ReferencePayloadBuilderTest.java index 1a0d13187..954996249 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/batch/api/ReferencePayloadBuilderTest.java +++ b/src/test/java/io/weaviate/client/v1/batch/api/ReferencePayloadBuilderTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.api; +package io.weaviate.client.v1.batch.api; import org.junit.Before; import org.junit.Test; @@ -6,8 +6,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; -import technology.semi.weaviate.client.base.util.BeaconPath; -import technology.semi.weaviate.client.v1.batch.model.BatchReference; +import io.weaviate.client.base.util.BeaconPath; +import io.weaviate.client.v1.batch.model.BatchReference; import static org.assertj.core.api.Assertions.assertThat; @@ -54,4 +54,4 @@ public void shouldHaveDeprecatedBeacons() { assertThat(payload.getFrom()).isEqualTo("weaviate://localhost/someFromClass/someFromId/someFromProperty"); assertThat(payload.getTo()).isEqualTo("weaviate://localhost/someToId"); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponseTest.java b/src/test/java/io/weaviate/client/v1/batch/model/BatchReferenceResponseTest.java similarity index 95% rename from src/test/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponseTest.java rename to src/test/java/io/weaviate/client/v1/batch/model/BatchReferenceResponseTest.java index 23b04325d..e99088e44 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/batch/model/BatchReferenceResponseTest.java +++ b/src/test/java/io/weaviate/client/v1/batch/model/BatchReferenceResponseTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.batch.model; +package io.weaviate.client.v1.batch.model; import com.google.gson.Gson; import java.io.BufferedReader; @@ -25,4 +25,4 @@ public void testDeserialization() throws FileNotFoundException { Assert.assertEquals("weaviate://localhost/07473b34-0ab2-4120-882d-303d9e13f7af", resp[0].getTo()); Assert.assertEquals("SUCCESS", resp[0].getResult().getStatus()); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/batch/util/ObjectsPathTest.java b/src/test/java/io/weaviate/client/v1/batch/util/ObjectsPathTest.java similarity index 91% rename from src/test/java/technology/semi/weaviate/client/v1/batch/util/ObjectsPathTest.java rename to src/test/java/io/weaviate/client/v1/batch/util/ObjectsPathTest.java index 71d6a91a4..dac706fb8 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/batch/util/ObjectsPathTest.java +++ b/src/test/java/io/weaviate/client/v1/batch/util/ObjectsPathTest.java @@ -1,10 +1,10 @@ -package technology.semi.weaviate.client.v1.batch.util; +package io.weaviate.client.v1.batch.util; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; import org.junit.Test; import org.junit.runner.RunWith; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/technology/semi/weaviate/client/v1/batch/util/ReferencesPathTest.java b/src/test/java/io/weaviate/client/v1/batch/util/ReferencesPathTest.java similarity index 88% rename from src/test/java/technology/semi/weaviate/client/v1/batch/util/ReferencesPathTest.java rename to src/test/java/io/weaviate/client/v1/batch/util/ReferencesPathTest.java index 33715c987..f489bf3b7 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/batch/util/ReferencesPathTest.java +++ b/src/test/java/io/weaviate/client/v1/batch/util/ReferencesPathTest.java @@ -1,10 +1,10 @@ -package technology.semi.weaviate.client.v1.batch.util; +package io.weaviate.client.v1.batch.util; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; import org.junit.Test; import org.junit.runner.RunWith; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseTest.java b/src/test/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseTest.java similarity index 92% rename from src/test/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseTest.java rename to src/test/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseTest.java index 08cf6d46a..ca3fce131 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/contextionary/model/C11yWordsResponseTest.java +++ b/src/test/java/io/weaviate/client/v1/contextionary/model/C11yWordsResponseTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.contextionary.model; +package io.weaviate.client.v1.contextionary.model; import com.google.gson.Gson; import java.io.BufferedReader; @@ -22,4 +22,4 @@ public void testDeserialization() throws FileNotFoundException { Assert.assertNotNull(resp); Assert.assertEquals("pizzaHawaii", resp.getConcatenatedWord().getConcatenatedWord()); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/data/builder/ReferencePayloadBuilderTest.java b/src/test/java/io/weaviate/client/v1/data/builder/ReferencePayloadBuilderTest.java similarity index 87% rename from src/test/java/technology/semi/weaviate/client/v1/data/builder/ReferencePayloadBuilderTest.java rename to src/test/java/io/weaviate/client/v1/data/builder/ReferencePayloadBuilderTest.java index 6b7703a04..c5005384d 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/data/builder/ReferencePayloadBuilderTest.java +++ b/src/test/java/io/weaviate/client/v1/data/builder/ReferencePayloadBuilderTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.builder; +package io.weaviate.client.v1.data.builder; import org.junit.Before; import org.junit.Test; @@ -6,8 +6,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; -import technology.semi.weaviate.client.base.util.BeaconPath; -import technology.semi.weaviate.client.v1.data.model.SingleRef; +import io.weaviate.client.base.util.BeaconPath; +import io.weaviate.client.v1.data.model.SingleRef; import static org.assertj.core.api.Assertions.assertThat; @@ -44,4 +44,4 @@ public void shouldHaveDeprecatedBeacon() { assertThat(payload.getBeacon()).isEqualTo("weaviate://localhost/someId"); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/data/model/ObjectTest.java b/src/test/java/io/weaviate/client/v1/data/model/ObjectTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/client/v1/data/model/ObjectTest.java rename to src/test/java/io/weaviate/client/v1/data/model/ObjectTest.java index 4ac2764e2..f9c3422d8 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/data/model/ObjectTest.java +++ b/src/test/java/io/weaviate/client/v1/data/model/ObjectTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -107,4 +107,4 @@ public void testSerializeWithReferenceProperty() { Assert.assertTrue(result.contains("otherFoods")); Assert.assertTrue(result.contains("weaviate://localhost/someClass/abefd256-8574-442b-9293-9205193737ee")); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/data/model/ObjectsListResponseTest.java b/src/test/java/io/weaviate/client/v1/data/model/ObjectsListResponseTest.java similarity index 93% rename from src/test/java/technology/semi/weaviate/client/v1/data/model/ObjectsListResponseTest.java rename to src/test/java/io/weaviate/client/v1/data/model/ObjectsListResponseTest.java index 163c7e018..5dc43193f 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/data/model/ObjectsListResponseTest.java +++ b/src/test/java/io/weaviate/client/v1/data/model/ObjectsListResponseTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.model; +package io.weaviate.client.v1.data.model; import com.google.gson.Gson; import java.io.File; @@ -23,4 +23,4 @@ public void testDeserialization() throws FileNotFoundException { Assert.assertEquals(4, resp.getObjects().length); Assert.assertEquals(4, resp.getTotalResults()); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/data/util/ObjectsPathTest.java b/src/test/java/io/weaviate/client/v1/data/util/ObjectsPathTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/client/v1/data/util/ObjectsPathTest.java rename to src/test/java/io/weaviate/client/v1/data/util/ObjectsPathTest.java index fbe9b626e..b1fc6bb77 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/data/util/ObjectsPathTest.java +++ b/src/test/java/io/weaviate/client/v1/data/util/ObjectsPathTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.util; +package io.weaviate.client.v1.data.util; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; @@ -10,8 +10,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.client.base.util.DbVersionSupport; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/technology/semi/weaviate/client/v1/data/util/ReferencesPathTest.java b/src/test/java/io/weaviate/client/v1/data/util/ReferencesPathTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/client/v1/data/util/ReferencesPathTest.java rename to src/test/java/io/weaviate/client/v1/data/util/ReferencesPathTest.java index e162d2164..5e5df2014 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/data/util/ReferencesPathTest.java +++ b/src/test/java/io/weaviate/client/v1/data/util/ReferencesPathTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.data.util; +package io.weaviate.client.v1.data.util; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; @@ -10,8 +10,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import technology.semi.weaviate.client.base.util.DbVersionSupport; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.client.base.util.DbVersionSupport; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/technology/semi/weaviate/client/v1/filters/WhereFilterUtilTest.java b/src/test/java/io/weaviate/client/v1/filters/WhereFilterUtilTest.java similarity index 99% rename from src/test/java/technology/semi/weaviate/client/v1/filters/WhereFilterUtilTest.java rename to src/test/java/io/weaviate/client/v1/filters/WhereFilterUtilTest.java index e19d3d14f..c6cf3fc12 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/filters/WhereFilterUtilTest.java +++ b/src/test/java/io/weaviate/client/v1/filters/WhereFilterUtilTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.filters; +package io.weaviate.client.v1.filters; import junit.framework.TestCase; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/AskArgumentTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/AskArgumentTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/AskArgumentTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/AskArgumentTest.java index a998570a6..3a6febd30 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/AskArgumentTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/AskArgumentTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import junit.framework.TestCase; import org.junit.Test; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupArgumentTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/GroupArgumentTest.java similarity index 95% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupArgumentTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/GroupArgumentTest.java index 964d1c4fe..92e676c13 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/GroupArgumentTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/GroupArgumentTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearImageArgumentTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearImageArgumentTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearImageArgumentTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/NearImageArgumentTest.java index 6127b1ff8..5fe73b509 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearImageArgumentTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearImageArgumentTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import java.io.BufferedReader; import java.io.File; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearObjectArgumentTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearObjectArgumentTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearObjectArgumentTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/NearObjectArgumentTest.java index d76875854..1388d2f3c 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearObjectArgumentTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearObjectArgumentTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextArgumentTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearTextArgumentTest.java similarity index 99% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextArgumentTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/NearTextArgumentTest.java index 1a283bfff..912a9f92a 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearTextArgumentTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearTextArgumentTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearVectorArgumentTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearVectorArgumentTest.java similarity index 94% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearVectorArgumentTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/NearVectorArgumentTest.java index 631751559..00cd301f7 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/NearVectorArgumentTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/NearVectorArgumentTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgumentTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/SortArgumentTest.java similarity index 93% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgumentTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/SortArgumentTest.java index e803c0774..e848f21c8 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgumentTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/SortArgumentTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import junit.framework.TestCase; import org.junit.Test; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgumentsTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/argument/SortArgumentsTest.java similarity index 96% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgumentsTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/argument/SortArgumentsTest.java index 6fa0deb0a..3ce308c32 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/argument/SortArgumentsTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/argument/SortArgumentsTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.argument; +package io.weaviate.client.v1.graphql.query.argument; import junit.framework.TestCase; import org.junit.Test; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/AggregateBuilderTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/builder/AggregateBuilderTest.java similarity index 94% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/AggregateBuilderTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/builder/AggregateBuilderTest.java index bc9f384cf..c69d9823d 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/AggregateBuilderTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/builder/AggregateBuilderTest.java @@ -1,15 +1,15 @@ -package technology.semi.weaviate.client.v1.graphql.query.builder; +package io.weaviate.client.v1.graphql.query.builder; import junit.framework.TestCase; import org.junit.Test; -import technology.semi.weaviate.client.v1.filters.Operator; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.fields.Field; -import technology.semi.weaviate.client.v1.graphql.query.fields.Fields; +import io.weaviate.client.v1.filters.Operator; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.fields.Field; +import io.weaviate.client.v1.graphql.query.fields.Fields; public class AggregateBuilderTest extends TestCase { @@ -274,4 +274,4 @@ public void testBuildAggregateWithObjectLimit() { assertNotNull(queryWithDist); assertEquals("{Aggregate{Pizza(nearImage: {image: \"iVBORw0KGgoAAAANS\" distance: 0.8}, objectLimit: 100){meta{count}}}}", queryWithDist); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/ExploreBuilderTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/builder/ExploreBuilderTest.java similarity index 94% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/ExploreBuilderTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/builder/ExploreBuilderTest.java index f44a83715..1f4b14184 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/ExploreBuilderTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/builder/ExploreBuilderTest.java @@ -1,14 +1,14 @@ -package technology.semi.weaviate.client.v1.graphql.query.builder; +package io.weaviate.client.v1.graphql.query.builder; import junit.framework.TestCase; import org.junit.Test; -import technology.semi.weaviate.client.v1.graphql.model.ExploreFields; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextMoveParameters; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.model.ExploreFields; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextMoveParameters; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; public class ExploreBuilderTest extends TestCase { diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/GetBuilderTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/builder/GetBuilderTest.java similarity index 94% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/GetBuilderTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/builder/GetBuilderTest.java index 90ee83ef5..2774af342 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/builder/GetBuilderTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/builder/GetBuilderTest.java @@ -1,20 +1,20 @@ -package technology.semi.weaviate.client.v1.graphql.query.builder; +package io.weaviate.client.v1.graphql.query.builder; import org.junit.Test; -import technology.semi.weaviate.client.v1.filters.Operator; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.client.v1.graphql.query.argument.AskArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.GroupArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.GroupType; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearImageArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortArguments; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortOrder; -import technology.semi.weaviate.client.v1.graphql.query.fields.Field; -import technology.semi.weaviate.client.v1.graphql.query.fields.Fields; -import technology.semi.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; +import io.weaviate.client.v1.filters.Operator; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.graphql.query.argument.AskArgument; +import io.weaviate.client.v1.graphql.query.argument.GroupArgument; +import io.weaviate.client.v1.graphql.query.argument.GroupType; +import io.weaviate.client.v1.graphql.query.argument.NearImageArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.argument.SortArgument; +import io.weaviate.client.v1.graphql.query.argument.SortArguments; +import io.weaviate.client.v1.graphql.query.argument.SortOrder; +import io.weaviate.client.v1.graphql.query.fields.Field; +import io.weaviate.client.v1.graphql.query.fields.Fields; +import io.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; import java.io.BufferedReader; import java.io.File; diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/FieldTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/fields/FieldTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/FieldTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/fields/FieldTest.java index ba5cc9409..29a8ebc04 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/FieldTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/fields/FieldTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.fields; +package io.weaviate.client.v1.graphql.query.fields; import junit.framework.TestCase; import org.junit.Assert; @@ -75,4 +75,4 @@ public void testBuild4() { // then Assert.assertEquals(expected, fieldString); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/FieldsTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/fields/FieldsTest.java similarity index 95% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/FieldsTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/fields/FieldsTest.java index 765ea85b8..1b36c8dda 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/FieldsTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/fields/FieldsTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.fields; +package io.weaviate.client.v1.graphql.query.fields; import junit.framework.TestCase; import org.junit.Assert; @@ -41,4 +41,4 @@ public void testBuildNested() { // then Assert.assertEquals(expected, fieldsParameter); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilderTest.java b/src/test/java/io/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilderTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilderTest.java rename to src/test/java/io/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilderTest.java index ee089c5b7..575d34d7d 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilderTest.java +++ b/src/test/java/io/weaviate/client/v1/graphql/query/fields/GenerativeSearchBuilderTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.graphql.query.fields; +package io.weaviate.client.v1.graphql.query.fields; import org.junit.Test; diff --git a/src/test/java/technology/semi/weaviate/client/v1/schema/model/PropertyTest.java b/src/test/java/io/weaviate/client/v1/schema/model/PropertyTest.java similarity index 95% rename from src/test/java/technology/semi/weaviate/client/v1/schema/model/PropertyTest.java rename to src/test/java/io/weaviate/client/v1/schema/model/PropertyTest.java index 8ba115302..c9517b22b 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/schema/model/PropertyTest.java +++ b/src/test/java/io/weaviate/client/v1/schema/model/PropertyTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; import com.google.gson.GsonBuilder; import java.util.Arrays; @@ -30,4 +30,4 @@ public void testSerialize() { assertNotNull(result); assertEquals(expected, result); } -} \ No newline at end of file +} diff --git a/src/test/java/technology/semi/weaviate/client/v1/schema/model/WeaviateClassTest.java b/src/test/java/io/weaviate/client/v1/schema/model/WeaviateClassTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/client/v1/schema/model/WeaviateClassTest.java rename to src/test/java/io/weaviate/client/v1/schema/model/WeaviateClassTest.java index bdc1243b5..50c3ed232 100644 --- a/src/test/java/technology/semi/weaviate/client/v1/schema/model/WeaviateClassTest.java +++ b/src/test/java/io/weaviate/client/v1/schema/model/WeaviateClassTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.client.v1.schema.model; +package io.weaviate.client.v1.schema.model; import com.google.gson.GsonBuilder; import org.junit.Test; diff --git a/src/test/java/technology/semi/weaviate/integration/client/WeaviateTestGenerics.java b/src/test/java/io/weaviate/integration/client/WeaviateTestGenerics.java similarity index 93% rename from src/test/java/technology/semi/weaviate/integration/client/WeaviateTestGenerics.java rename to src/test/java/io/weaviate/integration/client/WeaviateTestGenerics.java index 97a4ff2d2..de6554cc7 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/WeaviateTestGenerics.java +++ b/src/test/java/io/weaviate/integration/client/WeaviateTestGenerics.java @@ -1,14 +1,14 @@ -package technology.semi.weaviate.integration.client; +package io.weaviate.integration.client; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.misc.model.InvertedIndexConfig; -import technology.semi.weaviate.client.v1.schema.model.DataType; -import technology.semi.weaviate.client.v1.schema.model.Property; -import technology.semi.weaviate.client.v1.schema.model.Tokenization; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.misc.model.InvertedIndexConfig; +import io.weaviate.client.v1.schema.model.DataType; +import io.weaviate.client.v1.schema.model.Property; +import io.weaviate.client.v1.schema.model.Tokenization; +import io.weaviate.client.v1.schema.model.WeaviateClass; import java.util.Arrays; import java.util.HashMap; diff --git a/src/test/java/technology/semi/weaviate/integration/client/WeaviateVersion.java b/src/test/java/io/weaviate/integration/client/WeaviateVersion.java similarity index 85% rename from src/test/java/technology/semi/weaviate/integration/client/WeaviateVersion.java rename to src/test/java/io/weaviate/integration/client/WeaviateVersion.java index 5d31d6861..12d7723a0 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/WeaviateVersion.java +++ b/src/test/java/io/weaviate/integration/client/WeaviateVersion.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client; +package io.weaviate.integration.client; public class WeaviateVersion { diff --git a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthAzureClientCredentialsTest.java b/src/test/java/io/weaviate/integration/client/auth/AuthAzureClientCredentialsTest.java similarity index 83% rename from src/test/java/technology/semi/weaviate/integration/client/auth/AuthAzureClientCredentialsTest.java rename to src/test/java/io/weaviate/integration/client/auth/AuthAzureClientCredentialsTest.java index 26b36182e..bfa233e9a 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthAzureClientCredentialsTest.java +++ b/src/test/java/io/weaviate/integration/client/auth/AuthAzureClientCredentialsTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.auth; +package io.weaviate.integration.client.auth; import java.io.File; import java.util.Arrays; @@ -11,13 +11,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.auth.ClientCredentialsFlow; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.misc.model.Meta; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.auth.ClientCredentialsFlow; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.misc.model.Meta; +import static io.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; public class AuthAzureClientCredentialsTest { private String address; diff --git a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthOktaClientCredentialsTest.java b/src/test/java/io/weaviate/integration/client/auth/AuthOktaClientCredentialsTest.java similarity index 78% rename from src/test/java/technology/semi/weaviate/integration/client/auth/AuthOktaClientCredentialsTest.java rename to src/test/java/io/weaviate/integration/client/auth/AuthOktaClientCredentialsTest.java index 25c973f54..6d5375d84 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthOktaClientCredentialsTest.java +++ b/src/test/java/io/weaviate/integration/client/auth/AuthOktaClientCredentialsTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.auth; +package io.weaviate.integration.client.auth; import java.io.File; import java.util.Arrays; @@ -11,13 +11,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.auth.ClientCredentialsFlow; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.misc.model.Meta; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.auth.ClientCredentialsFlow; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.misc.model.Meta; +import static io.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; public class AuthOktaClientCredentialsTest { private String address; diff --git a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthOktaUsersTest.java b/src/test/java/io/weaviate/integration/client/auth/AuthOktaUsersTest.java similarity index 78% rename from src/test/java/technology/semi/weaviate/integration/client/auth/AuthOktaUsersTest.java rename to src/test/java/io/weaviate/integration/client/auth/AuthOktaUsersTest.java index 8040a83cd..05ccc6c74 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthOktaUsersTest.java +++ b/src/test/java/io/weaviate/integration/client/auth/AuthOktaUsersTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.auth; +package io.weaviate.integration.client.auth; import java.io.File; import org.apache.commons.lang3.StringUtils; @@ -10,13 +10,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.auth.ResourceOwnerPasswordFlow; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.misc.model.Meta; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.auth.ResourceOwnerPasswordFlow; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.misc.model.Meta; +import static io.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; public class AuthOktaUsersTest { private String address; diff --git a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthWCSUsersTest.java b/src/test/java/io/weaviate/integration/client/auth/AuthWCSUsersTest.java similarity index 78% rename from src/test/java/technology/semi/weaviate/integration/client/auth/AuthWCSUsersTest.java rename to src/test/java/io/weaviate/integration/client/auth/AuthWCSUsersTest.java index 1056242d1..1508929e7 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/auth/AuthWCSUsersTest.java +++ b/src/test/java/io/weaviate/integration/client/auth/AuthWCSUsersTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.auth; +package io.weaviate.integration.client.auth; import java.io.File; import org.apache.commons.lang3.StringUtils; @@ -10,13 +10,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.auth.ResourceOwnerPasswordFlow; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.misc.model.Meta; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.auth.ResourceOwnerPasswordFlow; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.misc.model.Meta; +import static io.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; public class AuthWCSUsersTest { private String address; diff --git a/src/test/java/technology/semi/weaviate/integration/client/auth/provider/NimbusAuthClientCredentialsRefreshTokenTest.java b/src/test/java/io/weaviate/integration/client/auth/provider/NimbusAuthClientCredentialsRefreshTokenTest.java similarity index 76% rename from src/test/java/technology/semi/weaviate/integration/client/auth/provider/NimbusAuthClientCredentialsRefreshTokenTest.java rename to src/test/java/io/weaviate/integration/client/auth/provider/NimbusAuthClientCredentialsRefreshTokenTest.java index 5c4a50224..888e99280 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/auth/provider/NimbusAuthClientCredentialsRefreshTokenTest.java +++ b/src/test/java/io/weaviate/integration/client/auth/provider/NimbusAuthClientCredentialsRefreshTokenTest.java @@ -1,5 +1,6 @@ -package technology.semi.weaviate.integration.client.auth.provider; +package io.weaviate.integration.client.auth.provider; +import io.weaviate.integration.client.WeaviateVersion; import java.io.File; import java.util.Arrays; import java.util.List; @@ -10,17 +11,16 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.auth.nimbus.AuthType; -import technology.semi.weaviate.client.v1.auth.nimbus.BaseAuth; -import technology.semi.weaviate.client.v1.auth.nimbus.NimbusAuth; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; -import technology.semi.weaviate.client.v1.auth.provider.AuthClientCredentialsTokenProvider; -import technology.semi.weaviate.client.v1.misc.model.Meta; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.auth.nimbus.AuthType; +import io.weaviate.client.v1.auth.nimbus.BaseAuth; +import io.weaviate.client.v1.auth.nimbus.NimbusAuth; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; +import io.weaviate.client.v1.auth.provider.AuthClientCredentialsTokenProvider; +import io.weaviate.client.v1.misc.model.Meta; public class NimbusAuthClientCredentialsRefreshTokenTest { private String address; @@ -65,7 +65,7 @@ protected AccessTokenProvider getTokenProvider(Config config, BaseAuth.AuthRespo assertThat(meta).isNotNull(); assertThat(meta.getError()).isNull(); assertThat(meta.getResult().getHostname()).isEqualTo("http://[::]:8082"); - assertThat(meta.getResult().getVersion()).isEqualTo(EXPECTED_WEAVIATE_VERSION); + assertThat(meta.getResult().getVersion()).isEqualTo(WeaviateVersion.EXPECTED_WEAVIATE_VERSION); Thread.sleep(3000l); // get the access token after refresh String afterRefreshBearerAccessTokenHeader = tokenProvider.getAccessToken(); @@ -74,7 +74,7 @@ protected AccessTokenProvider getTokenProvider(Config config, BaseAuth.AuthRespo assertThat(meta).isNotNull(); assertThat(meta.getError()).isNull(); assertThat(meta.getResult().getHostname()).isEqualTo("http://[::]:8082"); - assertThat(meta.getResult().getVersion()).isEqualTo(EXPECTED_WEAVIATE_VERSION); + assertThat(meta.getResult().getVersion()).isEqualTo(WeaviateVersion.EXPECTED_WEAVIATE_VERSION); } else { System.out.println("Skipping Okta Client Credentials refresh token test, missing OKTA_CLIENT_SECRET"); } diff --git a/src/test/java/technology/semi/weaviate/integration/client/auth/provider/NimbusAuthRefreshTokenTest.java b/src/test/java/io/weaviate/integration/client/auth/provider/NimbusAuthRefreshTokenTest.java similarity index 75% rename from src/test/java/technology/semi/weaviate/integration/client/auth/provider/NimbusAuthRefreshTokenTest.java rename to src/test/java/io/weaviate/integration/client/auth/provider/NimbusAuthRefreshTokenTest.java index d534f867a..b2c18f0eb 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/auth/provider/NimbusAuthRefreshTokenTest.java +++ b/src/test/java/io/weaviate/integration/client/auth/provider/NimbusAuthRefreshTokenTest.java @@ -1,5 +1,6 @@ -package technology.semi.weaviate.integration.client.auth.provider; +package io.weaviate.integration.client.auth.provider; +import io.weaviate.integration.client.WeaviateVersion; import java.io.File; import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -9,17 +10,16 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.auth.exception.AuthException; -import technology.semi.weaviate.client.v1.auth.nimbus.AuthType; -import technology.semi.weaviate.client.v1.auth.nimbus.BaseAuth; -import technology.semi.weaviate.client.v1.auth.nimbus.NimbusAuth; -import technology.semi.weaviate.client.v1.auth.provider.AccessTokenProvider; -import technology.semi.weaviate.client.v1.auth.provider.AuthRefreshTokenProvider; -import technology.semi.weaviate.client.v1.misc.model.Meta; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.auth.exception.AuthException; +import io.weaviate.client.v1.auth.nimbus.AuthType; +import io.weaviate.client.v1.auth.nimbus.BaseAuth; +import io.weaviate.client.v1.auth.nimbus.NimbusAuth; +import io.weaviate.client.v1.auth.provider.AccessTokenProvider; +import io.weaviate.client.v1.auth.provider.AuthRefreshTokenProvider; +import io.weaviate.client.v1.misc.model.Meta; public class NimbusAuthRefreshTokenTest { private String address; @@ -65,7 +65,7 @@ protected AccessTokenProvider getTokenProvider(Config config, BaseAuth.AuthRespo assertThat(meta).isNotNull(); assertThat(meta.getError()).isNull(); assertThat(meta.getResult().getHostname()).isEqualTo("http://[::]:8085"); - assertThat(meta.getResult().getVersion()).isEqualTo(EXPECTED_WEAVIATE_VERSION); + assertThat(meta.getResult().getVersion()).isEqualTo(WeaviateVersion.EXPECTED_WEAVIATE_VERSION); Thread.sleep(3000l); // get the access token after refresh String afterRefreshBearerAccessTokenHeader = tokenProvider.getAccessToken(); @@ -74,7 +74,7 @@ protected AccessTokenProvider getTokenProvider(Config config, BaseAuth.AuthRespo assertThat(meta).isNotNull(); assertThat(meta.getError()).isNull(); assertThat(meta.getResult().getHostname()).isEqualTo("http://[::]:8085"); - assertThat(meta.getResult().getVersion()).isEqualTo(EXPECTED_WEAVIATE_VERSION); + assertThat(meta.getResult().getVersion()).isEqualTo(WeaviateVersion.EXPECTED_WEAVIATE_VERSION); } else { System.out.println("Skipping WCS Refresh Token test, missing WCS_DUMMY_CI_PW"); } diff --git a/src/test/java/technology/semi/weaviate/integration/client/backup/ClientBackupTest.java b/src/test/java/io/weaviate/integration/client/backup/ClientBackupTest.java similarity index 95% rename from src/test/java/technology/semi/weaviate/integration/client/backup/ClientBackupTest.java rename to src/test/java/io/weaviate/integration/client/backup/ClientBackupTest.java index 50ed3e137..38818468c 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/backup/ClientBackupTest.java +++ b/src/test/java/io/weaviate/integration/client/backup/ClientBackupTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.backup; +package io.weaviate.integration.client.backup; import org.junit.After; import org.junit.Before; @@ -6,23 +6,23 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateError; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.v1.backup.api.BackupCreateStatusGetter; -import technology.semi.weaviate.client.v1.backup.api.BackupRestoreStatusGetter; -import technology.semi.weaviate.client.v1.backup.model.Backend; -import technology.semi.weaviate.client.v1.backup.model.BackupCreateResponse; -import technology.semi.weaviate.client.v1.backup.model.BackupCreateStatusResponse; -import technology.semi.weaviate.client.v1.backup.model.BackupRestoreResponse; -import technology.semi.weaviate.client.v1.backup.model.BackupRestoreStatusResponse; -import technology.semi.weaviate.client.v1.backup.model.CreateStatus; -import technology.semi.weaviate.client.v1.backup.model.RestoreStatus; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLResponse; -import technology.semi.weaviate.client.v1.graphql.query.fields.Field; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateError; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.v1.backup.api.BackupCreateStatusGetter; +import io.weaviate.client.v1.backup.api.BackupRestoreStatusGetter; +import io.weaviate.client.v1.backup.model.Backend; +import io.weaviate.client.v1.backup.model.BackupCreateResponse; +import io.weaviate.client.v1.backup.model.BackupCreateStatusResponse; +import io.weaviate.client.v1.backup.model.BackupRestoreResponse; +import io.weaviate.client.v1.backup.model.BackupRestoreStatusResponse; +import io.weaviate.client.v1.backup.model.CreateStatus; +import io.weaviate.client.v1.backup.model.RestoreStatus; +import io.weaviate.client.v1.graphql.model.GraphQLResponse; +import io.weaviate.client.v1.graphql.query.fields.Field; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import java.util.Map; diff --git a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchCreateMockServerTest.java b/src/test/java/io/weaviate/integration/client/batch/ClientBatchCreateMockServerTest.java similarity index 96% rename from src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchCreateMockServerTest.java rename to src/test/java/io/weaviate/integration/client/batch/ClientBatchCreateMockServerTest.java index a3e99f01d..cd7f6cc10 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchCreateMockServerTest.java +++ b/src/test/java/io/weaviate/integration/client/batch/ClientBatchCreateMockServerTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.batch; +package io.weaviate.integration.client.batch; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; @@ -10,14 +10,14 @@ import org.mockserver.integration.ClientAndServer; import org.mockserver.model.Delay; import org.mockserver.verify.VerificationTimes; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.Serializer; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.v1.batch.api.ObjectsBatcher; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.Serializer; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.v1.batch.api.ObjectsBatcher; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.data.model.WeaviateObject; import java.net.ConnectException; import java.net.SocketTimeoutException; diff --git a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchCreateTest.java b/src/test/java/io/weaviate/integration/client/batch/ClientBatchCreateTest.java similarity index 94% rename from src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchCreateTest.java rename to src/test/java/io/weaviate/integration/client/batch/ClientBatchCreateTest.java index c7dfe713f..7a237d78b 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchCreateTest.java +++ b/src/test/java/io/weaviate/integration/client/batch/ClientBatchCreateTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.batch; +package io.weaviate.integration.client.batch; import org.junit.After; import org.junit.Before; @@ -6,14 +6,14 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.batch.api.ObjectsBatcher; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.batch.api.ObjectsBatcher; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import java.util.ArrayList; diff --git a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchDeleteTest.java b/src/test/java/io/weaviate/integration/client/batch/ClientBatchDeleteTest.java similarity index 92% rename from src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchDeleteTest.java rename to src/test/java/io/weaviate/integration/client/batch/ClientBatchDeleteTest.java index 2f4d1cf78..2f0b469de 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchDeleteTest.java +++ b/src/test/java/io/weaviate/integration/client/batch/ClientBatchDeleteTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.batch; +package io.weaviate.integration.client.batch; import org.junit.After; import org.junit.Before; @@ -6,17 +6,17 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.batch.model.BatchDeleteOutput; -import technology.semi.weaviate.client.v1.batch.model.BatchDeleteResponse; -import technology.semi.weaviate.client.v1.batch.model.BatchDeleteResultStatus; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; -import technology.semi.weaviate.client.v1.filters.Operator; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.batch.model.BatchDeleteOutput; +import io.weaviate.client.v1.batch.model.BatchDeleteResponse; +import io.weaviate.client.v1.batch.model.BatchDeleteResultStatus; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.client.v1.filters.Operator; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import java.time.Instant; diff --git a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchReferencesCreateMockServerTest.java b/src/test/java/io/weaviate/integration/client/batch/ClientBatchReferencesCreateMockServerTest.java similarity index 96% rename from src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchReferencesCreateMockServerTest.java rename to src/test/java/io/weaviate/integration/client/batch/ClientBatchReferencesCreateMockServerTest.java index 1d9a293b1..37dd95840 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchReferencesCreateMockServerTest.java +++ b/src/test/java/io/weaviate/integration/client/batch/ClientBatchReferencesCreateMockServerTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.batch; +package io.weaviate.integration.client.batch; import com.jparams.junit4.JParamsTestRunner; import com.jparams.junit4.data.DataMethod; @@ -10,13 +10,13 @@ import org.mockserver.integration.ClientAndServer; import org.mockserver.model.Delay; import org.mockserver.verify.VerificationTimes; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.v1.batch.api.ReferencesBatcher; -import technology.semi.weaviate.client.v1.batch.model.BatchReference; -import technology.semi.weaviate.client.v1.batch.model.BatchReferenceResponse; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.v1.batch.api.ReferencesBatcher; +import io.weaviate.client.v1.batch.model.BatchReference; +import io.weaviate.client.v1.batch.model.BatchReferenceResponse; import java.net.ConnectException; import java.net.SocketTimeoutException; diff --git a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchReferencesCreateTest.java b/src/test/java/io/weaviate/integration/client/batch/ClientBatchReferencesCreateTest.java similarity index 93% rename from src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchReferencesCreateTest.java rename to src/test/java/io/weaviate/integration/client/batch/ClientBatchReferencesCreateTest.java index 0ecb2f691..ef35d0d82 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/batch/ClientBatchReferencesCreateTest.java +++ b/src/test/java/io/weaviate/integration/client/batch/ClientBatchReferencesCreateTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.batch; +package io.weaviate.integration.client.batch; import org.junit.After; import org.junit.Before; @@ -6,16 +6,16 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.batch.api.ReferencesBatcher; -import technology.semi.weaviate.client.v1.batch.model.BatchReference; -import technology.semi.weaviate.client.v1.batch.model.BatchReferenceResponse; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.batch.api.ReferencesBatcher; +import io.weaviate.client.v1.batch.model.BatchReference; +import io.weaviate.client.v1.batch.model.BatchReferenceResponse; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import java.util.ArrayList; diff --git a/src/test/java/technology/semi/weaviate/integration/client/classifications/ClientClassificationsTest.java b/src/test/java/io/weaviate/integration/client/classifications/ClientClassificationsTest.java similarity index 89% rename from src/test/java/technology/semi/weaviate/integration/client/classifications/ClientClassificationsTest.java rename to src/test/java/io/weaviate/integration/client/classifications/ClientClassificationsTest.java index e62c5a354..779c490af 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/classifications/ClientClassificationsTest.java +++ b/src/test/java/io/weaviate/integration/client/classifications/ClientClassificationsTest.java @@ -1,5 +1,6 @@ -package technology.semi.weaviate.integration.client.classifications; +package io.weaviate.integration.client.classifications; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import java.util.Arrays; import java.util.HashMap; @@ -12,18 +13,17 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.classifications.model.Classification; -import technology.semi.weaviate.client.v1.classifications.model.ClassificationType; -import technology.semi.weaviate.client.v1.classifications.model.ParamsKNN; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.schema.model.DataType; -import technology.semi.weaviate.client.v1.schema.model.Property; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.classifications.model.Classification; +import io.weaviate.client.v1.classifications.model.ClassificationType; +import io.weaviate.client.v1.classifications.model.ParamsKNN; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.schema.model.DataType; +import io.weaviate.client.v1.schema.model.Property; +import io.weaviate.client.v1.schema.model.WeaviateClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/technology/semi/weaviate/integration/client/cluster/ClientClusterTest.java b/src/test/java/io/weaviate/integration/client/cluster/ClientClusterTest.java similarity index 86% rename from src/test/java/technology/semi/weaviate/integration/client/cluster/ClientClusterTest.java rename to src/test/java/io/weaviate/integration/client/cluster/ClientClusterTest.java index 00ebb5710..9bf433128 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/cluster/ClientClusterTest.java +++ b/src/test/java/io/weaviate/integration/client/cluster/ClientClusterTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.cluster; +package io.weaviate.integration.client.cluster; import org.junit.After; import org.junit.Before; @@ -6,17 +6,17 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.cluster.model.NodesStatusResponse; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.cluster.model.NodesStatusResponse; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import static org.assertj.core.api.Assertions.assertThat; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_GIT_HASH; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import static io.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_GIT_HASH; +import static io.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; public class ClientClusterTest { diff --git a/src/test/java/technology/semi/weaviate/integration/client/contextionary/ClientContextionaryTest.java b/src/test/java/io/weaviate/integration/client/contextionary/ClientContextionaryTest.java similarity index 84% rename from src/test/java/technology/semi/weaviate/integration/client/contextionary/ClientContextionaryTest.java rename to src/test/java/io/weaviate/integration/client/contextionary/ClientContextionaryTest.java index e125eb607..8034b3c67 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/contextionary/ClientContextionaryTest.java +++ b/src/test/java/io/weaviate/integration/client/contextionary/ClientContextionaryTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.contextionary; +package io.weaviate.integration.client.contextionary; import java.io.File; import org.junit.Assert; @@ -7,10 +7,10 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.contextionary.model.C11yWordsResponse; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.contextionary.model.C11yWordsResponse; public class ClientContextionaryTest { private String address; diff --git a/src/test/java/technology/semi/weaviate/integration/client/data/ClientDataTest.java b/src/test/java/io/weaviate/integration/client/data/ClientDataTest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/integration/client/data/ClientDataTest.java rename to src/test/java/io/weaviate/integration/client/data/ClientDataTest.java index f5e9c57f4..55446ccb8 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/data/ClientDataTest.java +++ b/src/test/java/io/weaviate/integration/client/data/ClientDataTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.data; +package io.weaviate.integration.client.data; import java.io.File; import java.util.ArrayList; @@ -10,16 +10,16 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; -import technology.semi.weaviate.client.v1.schema.model.DataType; -import technology.semi.weaviate.client.v1.schema.model.Property; -import technology.semi.weaviate.client.v1.schema.model.Schema; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.client.v1.schema.model.DataType; +import io.weaviate.client.v1.schema.model.Property; +import io.weaviate.client.v1.schema.model.Schema; +import io.weaviate.client.v1.schema.model.WeaviateClass; +import io.weaviate.integration.client.WeaviateTestGenerics; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/technology/semi/weaviate/integration/client/data/ClientReferencesTest.java b/src/test/java/io/weaviate/integration/client/data/ClientReferencesTest.java similarity index 96% rename from src/test/java/technology/semi/weaviate/integration/client/data/ClientReferencesTest.java rename to src/test/java/io/weaviate/integration/client/data/ClientReferencesTest.java index 36cac0df3..47e1f947f 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/data/ClientReferencesTest.java +++ b/src/test/java/io/weaviate/integration/client/data/ClientReferencesTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.data; +package io.weaviate.integration.client.data; import java.io.File; import java.util.HashMap; @@ -9,14 +9,14 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.data.model.ObjectReference; -import technology.semi.weaviate.client.v1.data.model.SingleRef; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.data.replication.model.ConsistencyLevel; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.data.model.ObjectReference; +import io.weaviate.client.v1.data.model.SingleRef; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.data.replication.model.ConsistencyLevel; +import io.weaviate.integration.client.WeaviateTestGenerics; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/technology/semi/weaviate/integration/client/deprecated/batch/ClientBatchCreateDeprecatedAPITest.java b/src/test/java/io/weaviate/integration/client/deprecated/batch/ClientBatchCreateDeprecatedAPITest.java similarity index 94% rename from src/test/java/technology/semi/weaviate/integration/client/deprecated/batch/ClientBatchCreateDeprecatedAPITest.java rename to src/test/java/io/weaviate/integration/client/deprecated/batch/ClientBatchCreateDeprecatedAPITest.java index 2ccc1175a..2418fc88f 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/deprecated/batch/ClientBatchCreateDeprecatedAPITest.java +++ b/src/test/java/io/weaviate/integration/client/deprecated/batch/ClientBatchCreateDeprecatedAPITest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.deprecated.batch; +package io.weaviate.integration.client.deprecated.batch; import java.io.File; import java.util.HashMap; @@ -12,14 +12,14 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.batch.model.BatchReference; -import technology.semi.weaviate.client.v1.batch.model.BatchReferenceResponse; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.batch.model.BatchReference; +import io.weaviate.client.v1.batch.model.BatchReferenceResponse; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.integration.client.WeaviateTestGenerics; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/technology/semi/weaviate/integration/client/deprecated/data/ClientDataDeprecatedAPITest.java b/src/test/java/io/weaviate/integration/client/deprecated/data/ClientDataDeprecatedAPITest.java similarity index 98% rename from src/test/java/technology/semi/weaviate/integration/client/deprecated/data/ClientDataDeprecatedAPITest.java rename to src/test/java/io/weaviate/integration/client/deprecated/data/ClientDataDeprecatedAPITest.java index 061633a85..8ef5631f3 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/deprecated/data/ClientDataDeprecatedAPITest.java +++ b/src/test/java/io/weaviate/integration/client/deprecated/data/ClientDataDeprecatedAPITest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.deprecated.data; +package io.weaviate.integration.client.deprecated.data; import java.io.File; import java.util.ArrayList; @@ -16,15 +16,15 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.schema.model.DataType; -import technology.semi.weaviate.client.v1.schema.model.Property; -import technology.semi.weaviate.client.v1.schema.model.Schema; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.schema.model.DataType; +import io.weaviate.client.v1.schema.model.Property; +import io.weaviate.client.v1.schema.model.Schema; +import io.weaviate.client.v1.schema.model.WeaviateClass; +import io.weaviate.integration.client.WeaviateTestGenerics; public class ClientDataDeprecatedAPITest { private String address; diff --git a/src/test/java/technology/semi/weaviate/integration/client/deprecated/data/ClientReferencesDeprecatedAPITest.java b/src/test/java/io/weaviate/integration/client/deprecated/data/ClientReferencesDeprecatedAPITest.java similarity index 96% rename from src/test/java/technology/semi/weaviate/integration/client/deprecated/data/ClientReferencesDeprecatedAPITest.java rename to src/test/java/io/weaviate/integration/client/deprecated/data/ClientReferencesDeprecatedAPITest.java index 8ff61e8e3..4ea293b82 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/deprecated/data/ClientReferencesDeprecatedAPITest.java +++ b/src/test/java/io/weaviate/integration/client/deprecated/data/ClientReferencesDeprecatedAPITest.java @@ -1,17 +1,17 @@ -package technology.semi.weaviate.integration.client.deprecated.data; +package io.weaviate.integration.client.deprecated.data; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.data.model.ObjectReference; -import technology.semi.weaviate.client.v1.data.model.SingleRef; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.data.model.ObjectReference; +import io.weaviate.client.v1.data.model.SingleRef; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import java.util.HashMap; diff --git a/src/test/java/technology/semi/weaviate/integration/client/graphql/ClientGraphQLTest.java b/src/test/java/io/weaviate/integration/client/graphql/ClientGraphQLTest.java similarity index 97% rename from src/test/java/technology/semi/weaviate/integration/client/graphql/ClientGraphQLTest.java rename to src/test/java/io/weaviate/integration/client/graphql/ClientGraphQLTest.java index 262ddb30e..eb545311b 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/graphql/ClientGraphQLTest.java +++ b/src/test/java/io/weaviate/integration/client/graphql/ClientGraphQLTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.graphql; +package io.weaviate.integration.client.graphql; import org.apache.commons.lang3.StringUtils; import org.junit.Before; @@ -6,28 +6,28 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.batch.model.ObjectGetResponse; -import technology.semi.weaviate.client.v1.data.model.WeaviateObject; -import technology.semi.weaviate.client.v1.filters.Operator; -import technology.semi.weaviate.client.v1.filters.WhereFilter; -import technology.semi.weaviate.client.v1.graphql.model.ExploreFields; -import technology.semi.weaviate.client.v1.graphql.model.GraphQLResponse; -import technology.semi.weaviate.client.v1.graphql.query.argument.Bm25Argument; -import technology.semi.weaviate.client.v1.graphql.query.argument.HybridArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.GroupArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.GroupType; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearObjectArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearTextMoveParameters; -import technology.semi.weaviate.client.v1.graphql.query.argument.NearVectorArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortArgument; -import technology.semi.weaviate.client.v1.graphql.query.argument.SortOrder; -import technology.semi.weaviate.client.v1.graphql.query.fields.Field; -import technology.semi.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; -import technology.semi.weaviate.integration.client.WeaviateTestGenerics; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.batch.model.ObjectGetResponse; +import io.weaviate.client.v1.data.model.WeaviateObject; +import io.weaviate.client.v1.filters.Operator; +import io.weaviate.client.v1.filters.WhereFilter; +import io.weaviate.client.v1.graphql.model.ExploreFields; +import io.weaviate.client.v1.graphql.model.GraphQLResponse; +import io.weaviate.client.v1.graphql.query.argument.Bm25Argument; +import io.weaviate.client.v1.graphql.query.argument.HybridArgument; +import io.weaviate.client.v1.graphql.query.argument.GroupArgument; +import io.weaviate.client.v1.graphql.query.argument.GroupType; +import io.weaviate.client.v1.graphql.query.argument.NearObjectArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextArgument; +import io.weaviate.client.v1.graphql.query.argument.NearTextMoveParameters; +import io.weaviate.client.v1.graphql.query.argument.NearVectorArgument; +import io.weaviate.client.v1.graphql.query.argument.SortArgument; +import io.weaviate.client.v1.graphql.query.argument.SortOrder; +import io.weaviate.client.v1.graphql.query.fields.Field; +import io.weaviate.client.v1.graphql.query.fields.GenerativeSearchBuilder; +import io.weaviate.integration.client.WeaviateTestGenerics; import java.io.File; import java.util.ArrayList; diff --git a/src/test/java/technology/semi/weaviate/integration/client/misc/ClientMiscTest.java b/src/test/java/io/weaviate/integration/client/misc/ClientMiscTest.java similarity index 85% rename from src/test/java/technology/semi/weaviate/integration/client/misc/ClientMiscTest.java rename to src/test/java/io/weaviate/integration/client/misc/ClientMiscTest.java index 73ef09dc2..5760dfdd9 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/misc/ClientMiscTest.java +++ b/src/test/java/io/weaviate/integration/client/misc/ClientMiscTest.java @@ -1,14 +1,14 @@ -package technology.semi.weaviate.integration.client.misc; +package io.weaviate.integration.client.misc; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.v1.misc.model.Meta; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.v1.misc.model.Meta; import java.io.File; @@ -16,7 +16,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static technology.semi.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; +import static io.weaviate.integration.client.WeaviateVersion.EXPECTED_WEAVIATE_VERSION; public class ClientMiscTest { diff --git a/src/test/java/technology/semi/weaviate/integration/client/schema/ClientSchemaTest.java b/src/test/java/io/weaviate/integration/client/schema/ClientSchemaTest.java similarity index 96% rename from src/test/java/technology/semi/weaviate/integration/client/schema/ClientSchemaTest.java rename to src/test/java/io/weaviate/integration/client/schema/ClientSchemaTest.java index 06ee37435..29c7f26ad 100644 --- a/src/test/java/technology/semi/weaviate/integration/client/schema/ClientSchemaTest.java +++ b/src/test/java/io/weaviate/integration/client/schema/ClientSchemaTest.java @@ -1,4 +1,4 @@ -package technology.semi.weaviate.integration.client.schema; +package io.weaviate.integration.client.schema; import java.io.File; import java.util.ArrayList; @@ -14,26 +14,26 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; -import technology.semi.weaviate.client.Config; -import technology.semi.weaviate.client.WeaviateClient; -import technology.semi.weaviate.client.base.Result; -import technology.semi.weaviate.client.base.WeaviateErrorMessage; -import technology.semi.weaviate.client.v1.misc.model.BM25Config; -import technology.semi.weaviate.client.v1.misc.model.DistanceType; -import technology.semi.weaviate.client.v1.misc.model.InvertedIndexConfig; -import technology.semi.weaviate.client.v1.misc.model.PQConfig; -import technology.semi.weaviate.client.v1.misc.model.ReplicationConfig; -import technology.semi.weaviate.client.v1.misc.model.ShardingConfig; -import technology.semi.weaviate.client.v1.misc.model.StopwordConfig; -import technology.semi.weaviate.client.v1.misc.model.VectorIndexConfig; -import technology.semi.weaviate.client.v1.schema.model.DataType; -import technology.semi.weaviate.client.v1.schema.model.Property; -import technology.semi.weaviate.client.v1.schema.model.Schema; -import technology.semi.weaviate.client.v1.schema.model.Shard; -import technology.semi.weaviate.client.v1.schema.model.ShardStatuses; -import technology.semi.weaviate.client.v1.schema.model.ShardStatus; -import technology.semi.weaviate.client.v1.schema.model.Tokenization; -import technology.semi.weaviate.client.v1.schema.model.WeaviateClass; +import io.weaviate.client.Config; +import io.weaviate.client.WeaviateClient; +import io.weaviate.client.base.Result; +import io.weaviate.client.base.WeaviateErrorMessage; +import io.weaviate.client.v1.misc.model.BM25Config; +import io.weaviate.client.v1.misc.model.DistanceType; +import io.weaviate.client.v1.misc.model.InvertedIndexConfig; +import io.weaviate.client.v1.misc.model.PQConfig; +import io.weaviate.client.v1.misc.model.ReplicationConfig; +import io.weaviate.client.v1.misc.model.ShardingConfig; +import io.weaviate.client.v1.misc.model.StopwordConfig; +import io.weaviate.client.v1.misc.model.VectorIndexConfig; +import io.weaviate.client.v1.schema.model.DataType; +import io.weaviate.client.v1.schema.model.Property; +import io.weaviate.client.v1.schema.model.Schema; +import io.weaviate.client.v1.schema.model.Shard; +import io.weaviate.client.v1.schema.model.ShardStatuses; +import io.weaviate.client.v1.schema.model.ShardStatus; +import io.weaviate.client.v1.schema.model.Tokenization; +import io.weaviate.client.v1.schema.model.WeaviateClass; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.MAP;