Relocate to io.weaviate organization

README.md

@@ -8,7 +8,7 @@ In order to get start using the java client one needs to add it's dependency:
 
 ```xml
 <dependency>
-  <groupId>technology.semi.weaviate</groupId>
+  <groupId>io.weaviate</groupId>
   <artifactId>client</artifactId>
   <version>3.6.5</version>
 </dependency>
@@ -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) {

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>technology.semi.weaviate</groupId>
+  <groupId>io.weaviate</groupId>
   <artifactId>client</artifactId>
   <packaging>jar</packaging>
   <version>3.6.6-SNAPSHOT</version>

src/main/java/technology/semi/weaviate/client/Config.java → 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;
 

src/main/java/technology/semi/weaviate/client/WeaviateAuthClient.java → 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 {
 

src/main/java/technology/semi/weaviate/client/WeaviateClient.java → 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) {

src/main/java/technology/semi/weaviate/client/base/BaseClient.java → 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<T> {
   private final HttpClient client;

src/main/java/technology/semi/weaviate/client/base/ClientResult.java → 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<T> {
   Result<T> run();

src/main/java/technology/semi/weaviate/client/base/Response.java → 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;

src/main/java/technology/semi/weaviate/client/base/Result.java → 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;

src/main/java/technology/semi/weaviate/client/base/Serializer.java → 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;

src/main/java/technology/semi/weaviate/client/base/WeaviateError.java → 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;

src/main/java/technology/semi/weaviate/client/base/WeaviateErrorMessage.java → 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;

src/main/java/technology/semi/weaviate/client/base/WeaviateErrorResponse.java → 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;

src/main/java/technology/semi/weaviate/client/base/http/HttpClient.java → 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;

src/main/java/technology/semi/weaviate/client/base/http/HttpResponse.java → 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;

src/main/java/technology/semi/weaviate/client/base/http/builder/HttpApacheClientBuilder.java → 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 {
 

src/main/java/technology/semi/weaviate/client/base/http/impl/CommonsHttpClientImpl.java → 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<String, String> headers;

src/main/java/technology/semi/weaviate/client/base/util/Assert.java → 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;
 

src/main/java/technology/semi/weaviate/client/base/util/BeaconPath.java → 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;

src/main/java/technology/semi/weaviate/client/base/util/DbVersionProvider.java → 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;
 

src/main/java/technology/semi/weaviate/client/base/util/DbVersionSupport.java → 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;

src/main/java/technology/semi/weaviate/client/base/util/TriConsumer.java → 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<T, U, V> {

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<String> scopes) throws AuthException;
+  WeaviateClient getAuthClient(Config config) throws AuthException;
+}

src/main/java/technology/semi/weaviate/client/v1/auth/BearerTokenFlow.java → 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 {
 

src/main/java/technology/semi/weaviate/client/v1/auth/ClientCredentialsFlow.java → 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 {
 

src/main/java/technology/semi/weaviate/client/v1/auth/ResourceOwnerPasswordFlow.java → 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 {
 

src/main/java/technology/semi/weaviate/client/v1/auth/exception/AuthException.java → 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) {

src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/AuthType.java → 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,

src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/BaseAuth.java → 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";

src/main/java/technology/semi/weaviate/client/v1/auth/nimbus/NimbusAuth.java → 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,18 +18,18 @@
 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;
 import java.util.Collections;
 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 {