Deprecate gRPC API

rest/src/main/java/io/metaloom/loom/client/http/LoomBinaryResponse.java → common/src/main/java/io/metaloom/loom/client/common/LoomBinaryResponse.java

@@ -1,4 +1,4 @@
-package io.metaloom.loom.client.http;
+package io.metaloom.loom.client.common;
 
 import java.io.InputStream;
 import java.util.Arrays;

common/src/main/java/io/metaloom/loom/client/common/LoomClient.java

@@ -0,0 +1,18 @@
+package io.metaloom.loom.client.common;
+
+import io.metaloom.loom.client.common.method.ClientMethods;
+
+public interface LoomClient extends ClientMethods, CommonSettings, AutoCloseable {
+
+	/**
+	 * Set the token to be used for authentication.
+	 *
+	 * @param token
+	 */
+	void setToken(String token);
+
+	/**
+	 * Close the client and release all resources.
+	 */
+	void close();
+}

common/src/main/java/io/metaloom/loom/client/common/LoomClientException.java

@@ -0,0 +1,26 @@
+package io.metaloom.loom.client.common;
+
+public class LoomClientException extends Exception {
+
+	private static final long serialVersionUID = 6434236577973357902L;
+	private int code;
+
+	public LoomClientException(int code, String msg) {
+		super(msg);
+		this.code = code;
+	}
+
+	public LoomClientException(int code, String msg, Exception e) {
+		super(msg, e);
+		this.code = code;
+	}
+
+	public int getStatusCode() {
+		return code;
+	}
+
+	public String getStatusMsg() {
+		return getMessage();
+	}
+
+}

common/src/main/java/io/metaloom/loom/client/common/LoomClientRequest.java

@@ -0,0 +1,12 @@
+package io.metaloom.loom.client.common;
+
+import io.metaloom.loom.rest.model.RestResponseModel;
+import io.reactivex.rxjava3.core.Single;
+
+public interface LoomClientRequest<T extends RestResponseModel<T>> extends QueryParameters<T> {
+
+	Single<T> async();
+
+	T sync() throws LoomClientException;
+
+}

rest/src/main/java/io/metaloom/loom/client/http/parameter/QueryParameters.java → common/src/main/java/io/metaloom/loom/client/common/QueryParameters.java

@@ -1,4 +1,4 @@
-package io.metaloom.loom.client.http.parameter;
+package io.metaloom.loom.client.common;
 
 import java.time.Duration;
 import java.util.UUID;
@@ -9,7 +9,6 @@
 import io.metaloom.filter.key.impl.StringFilterKey;
 import io.metaloom.loom.api.sort.SortDirection;
 import io.metaloom.loom.api.sort.SortKey;
-import io.metaloom.loom.client.http.LoomClientRequest;
 import io.metaloom.loom.rest.model.RestResponseModel;
 import io.metaloom.loom.rest.parameter.QueryParameterKey;
 

rest/src/main/java/io/metaloom/loom/client/http/method/AnnotationMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/AnnotationMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.annotation.AnnotationCreateRequest;
 import io.metaloom.loom.rest.model.annotation.AnnotationListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/AssetLocationMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/AssetLocationMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.asset.location.AssetLocationCreateRequest;
 import io.metaloom.loom.rest.model.asset.location.AssetLocationListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/AssetMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/AssetMethods.java

@@ -1,11 +1,11 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import static io.metaloom.loom.api.asset.AssetId.assetId;
 
 import java.util.UUID;
 
 import io.metaloom.loom.api.asset.AssetId;
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.asset.AssetCreateRequest;
 import io.metaloom.loom.rest.model.asset.AssetListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/AttachmentMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/AttachmentMethods.java

@@ -1,10 +1,10 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.io.InputStream;
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomBinaryResponse;
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomBinaryResponse;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.attachment.AttachmentListResponse;
 import io.metaloom.loom.rest.model.attachment.AttachmentResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/AuthenticationMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/AuthenticationMethods.java

@@ -1,6 +1,6 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.auth.AuthLoginResponse;
 
 public interface AuthenticationMethods {

common/src/main/java/io/metaloom/loom/client/common/method/ClientMethods.java

@@ -0,0 +1,23 @@
+package io.metaloom.loom.client.common.method;
+
+public interface ClientMethods extends
+	UserMethods,
+	AssetMethods,
+	AssetLocationMethods,
+	AttachmentMethods,
+	ClusterMethods,
+	GroupMethods,
+	RoleMethods,
+	CollectionMethods,
+	AnnotationMethods,
+	TaskMethods,
+	TagMethods,
+	AuthenticationMethods,
+	ReactionMethods,
+	TokenMethods,
+	LibraryMethods,
+	ProjectMethods,
+	CommentMethods,
+	EmbeddingMethods {
+
+}

rest/src/main/java/io/metaloom/loom/client/http/method/ClusterMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/ClusterMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.cluster.ClusterCreateRequest;
 import io.metaloom.loom.rest.model.cluster.ClusterListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/CollectionMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/CollectionMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.collection.CollectionCreateRequest;
 import io.metaloom.loom.rest.model.collection.CollectionListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/CommentMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/CommentMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.comment.CommentCreateRequest;
 import io.metaloom.loom.rest.model.comment.CommentListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/EmbeddingMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/EmbeddingMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.embedding.EmbeddingCreateRequest;
 import io.metaloom.loom.rest.model.embedding.EmbeddingListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/GroupMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/GroupMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.group.GroupCreateRequest;
 import io.metaloom.loom.rest.model.group.GroupListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/LibraryMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/LibraryMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.library.LibraryCreateRequest;
 import io.metaloom.loom.rest.model.library.LibraryListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/ProjectMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/ProjectMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.project.ProjectCreateRequest;
 import io.metaloom.loom.rest.model.project.ProjectListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/ReactionMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/ReactionMethods.java

@@ -1,11 +1,11 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import static io.metaloom.loom.api.asset.AssetId.assetId;
 
 import java.util.UUID;
 
 import io.metaloom.loom.api.asset.AssetId;
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.reaction.ReactionCreateRequest;
 import io.metaloom.loom.rest.model.reaction.ReactionListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/RoleMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/RoleMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.role.RoleCreateRequest;
 import io.metaloom.loom.rest.model.role.RoleListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/TagMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/TagMethods.java

@@ -1,11 +1,11 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import static io.metaloom.loom.api.asset.AssetId.assetId;
 
 import java.util.UUID;
 
 import io.metaloom.loom.api.asset.AssetId;
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.tag.TagCreateRequest;
 import io.metaloom.loom.rest.model.tag.TagListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/TaskMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/TaskMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.task.TaskCreateRequest;
 import io.metaloom.loom.rest.model.task.TaskListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/TokenMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/TokenMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.token.TokenCreateRequest;
 import io.metaloom.loom.rest.model.token.TokenListResponse;

rest/src/main/java/io/metaloom/loom/client/http/method/UserMethods.java → common/src/main/java/io/metaloom/loom/client/common/method/UserMethods.java

@@ -1,8 +1,8 @@
-package io.metaloom.loom.client.http.method;
+package io.metaloom.loom.client.common.method;
 
 import java.util.UUID;
 
-import io.metaloom.loom.client.http.LoomClientRequest;
+import io.metaloom.loom.client.common.LoomClientRequest;
 import io.metaloom.loom.rest.model.NoResponse;
 import io.metaloom.loom.rest.model.user.UserCreateRequest;
 import io.metaloom.loom.rest.model.user.UserListResponse;

grpc/src/main/java/io/metaloom/loom/client/grpc/LoomGRPCClient.java

@@ -1,9 +1,10 @@
 package io.metaloom.loom.client.grpc;
 
+import io.metaloom.loom.client.common.LoomClient;
 import io.metaloom.loom.client.grpc.impl.LoomGRPCClientImpl;
 import io.metaloom.loom.client.grpc.method.AssetMethods;
 
-public interface LoomGRPCClient extends AssetMethods, ClientSettings, AutoCloseable {
+public interface LoomGRPCClient extends AssetMethods, ClientSettings, LoomClient {
 
 	static LoomGRPCClientImpl.Builder builder() {
 		return LoomGRPCClientImpl.builder();
@@ -12,16 +13,4 @@ static LoomGRPCClientImpl.Builder builder() {
 	// TODO add version info
 	String USER_AGENT = "Loom gRPC Client";
 
-	/**
-	 * Close the prepared transport channel.
-	 */
-	void close();
-
-	/**
-	 * Set the token that will be used to authenticate the requests.
-	 * 
-	 * @param token
-	 */
-	void setToken(String token);
-
 }

pom.xml

@@ -21,7 +21,9 @@
     <modules>
         <module>common</module>
         <module>rest</module>
+        <!--
         <module>grpc</module>
+        -->
         <module>report</module>
     </modules>
 
@@ -82,6 +84,12 @@
     </licenses>
 
     <dependencies>
+        <!-- Models-->
+        <dependency>
+            <groupId>io.metaloom.loom.shared</groupId>
+            <artifactId>loom-rest-model</artifactId>
+        </dependency>
+
         <!--Test-->
         <dependency>
             <groupId>org.testcontainers</groupId>

report/pom.xml

@@ -1,6 +1,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	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>
 
 	<artifactId>loom-client-report</artifactId>
@@ -25,11 +25,13 @@
 			<artifactId>loom-client-rest</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<!-- 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>loom-client-grpc</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		-->
 	</dependencies>
 
 	<build>