Repackage blocking clients to prepare for introducing non-blocking cl…

…ients

src/main/java/rs/iggy/consumergroup/ConsumerGroupsClient.java → src/main/java/rs/iggy/clients/blocking/ConsumerGroupsClient.java

@@ -1,5 +1,7 @@
-package rs.iggy.consumergroup;
+package rs.iggy.clients.blocking;
 
+import rs.iggy.consumergroup.ConsumerGroup;
+import rs.iggy.consumergroup.ConsumerGroupDetails;
 import rs.iggy.identifier.ConsumerGroupId;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;

src/main/java/rs/iggy/consumeroffset/ConsumerOffsetsClient.java → src/main/java/rs/iggy/clients/blocking/ConsumerOffsetsClient.java

@@ -1,5 +1,6 @@
-package rs.iggy.consumeroffset;
+package rs.iggy.clients.blocking;
 
+import rs.iggy.consumeroffset.ConsumerOffsetInfo;
 import rs.iggy.identifier.ConsumerId;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;

src/main/java/rs/iggy/clients/blocking/IggyClient.java

@@ -0,0 +1,21 @@
+package rs.iggy.clients.blocking;
+
+public interface IggyClient {
+
+    SystemClient system();
+
+    StreamsClient streams();
+
+    UsersClient users();
+
+    TopicsClient topics();
+
+    PartitionsClient partitions();
+
+    ConsumerGroupsClient consumerGroups();
+
+    ConsumerOffsetsClient consumerOffsets();
+
+    MessagesClient messages();
+
+}

src/main/java/rs/iggy/message/MessagesClient.java → src/main/java/rs/iggy/clients/blocking/MessagesClient.java

@@ -1,8 +1,12 @@
-package rs.iggy.message;
+package rs.iggy.clients.blocking;
 
 import rs.iggy.identifier.ConsumerId;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;
+import rs.iggy.message.MessageToSend;
+import rs.iggy.message.Partitioning;
+import rs.iggy.message.PolledMessages;
+import rs.iggy.message.PollingStrategy;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/rs/iggy/partition/PartitionsClient.java → src/main/java/rs/iggy/clients/blocking/PartitionsClient.java

@@ -1,4 +1,4 @@
-package rs.iggy.partition;
+package rs.iggy.clients.blocking;
 
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;

src/main/java/rs/iggy/stream/StreamsClient.java → src/main/java/rs/iggy/clients/blocking/StreamsClient.java

@@ -1,6 +1,8 @@
-package rs.iggy.stream;
+package rs.iggy.clients.blocking;
 
 import rs.iggy.identifier.StreamId;
+import rs.iggy.stream.StreamBase;
+import rs.iggy.stream.StreamDetails;
 import java.util.List;
 
 public interface StreamsClient {

src/main/java/rs/iggy/system/SystemClient.java → src/main/java/rs/iggy/clients/blocking/SystemClient.java

@@ -1,5 +1,8 @@
-package rs.iggy.system;
+package rs.iggy.clients.blocking;
 
+import rs.iggy.system.ClientInfo;
+import rs.iggy.system.ClientInfoDetails;
+import rs.iggy.system.Stats;
 import java.util.List;
 
 public interface SystemClient {

src/main/java/rs/iggy/topic/TopicsClient.java → src/main/java/rs/iggy/clients/blocking/TopicsClient.java

@@ -1,7 +1,9 @@
-package rs.iggy.topic;
+package rs.iggy.clients.blocking;
 
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;
+import rs.iggy.topic.Topic;
+import rs.iggy.topic.TopicDetails;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/rs/iggy/user/UsersClient.java → src/main/java/rs/iggy/clients/blocking/UsersClient.java

@@ -1,6 +1,7 @@
-package rs.iggy.user;
+package rs.iggy.clients.blocking;
 
 import rs.iggy.identifier.UserId;
+import rs.iggy.user.*;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/rs/iggy/http/ConsumerGroupsHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/ConsumerGroupsHttpClient.java

@@ -1,9 +1,9 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import rs.iggy.clients.blocking.ConsumerGroupsClient;
 import rs.iggy.consumergroup.ConsumerGroup;
 import rs.iggy.consumergroup.ConsumerGroupDetails;
-import rs.iggy.consumergroup.ConsumerGroupsClient;
 import rs.iggy.identifier.ConsumerGroupId;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;

src/main/java/rs/iggy/http/ConsumerOffsetsHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/ConsumerOffsetsHttpClient.java

@@ -1,8 +1,8 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import org.apache.hc.core5.http.message.BasicNameValuePair;
+import rs.iggy.clients.blocking.ConsumerOffsetsClient;
 import rs.iggy.consumeroffset.ConsumerOffsetInfo;
-import rs.iggy.consumeroffset.ConsumerOffsetsClient;
 import rs.iggy.identifier.ConsumerId;
 import rs.iggy.identifier.SingleConsumerId;
 import rs.iggy.identifier.StreamId;

src/main/java/rs/iggy/http/HttpClient.java → src/main/java/rs/iggy/clients/blocking/http/HttpClient.java

@@ -1,4 +1,4 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -11,8 +11,8 @@
 import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import rs.iggy.http.error.IggyHttpError;
-import rs.iggy.http.error.IggyHttpException;
+import rs.iggy.clients.blocking.http.error.IggyHttpError;
+import rs.iggy.clients.blocking.http.error.IggyHttpException;
 import java.io.IOException;
 import java.util.Optional;
 

src/main/java/rs/iggy/http/IggyHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/IggyHttpClient.java

@@ -1,14 +1,6 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
-import rs.iggy.IggyClient;
-import rs.iggy.consumergroup.ConsumerGroupsClient;
-import rs.iggy.consumeroffset.ConsumerOffsetsClient;
-import rs.iggy.message.MessagesClient;
-import rs.iggy.partition.PartitionsClient;
-import rs.iggy.stream.StreamsClient;
-import rs.iggy.system.SystemClient;
-import rs.iggy.topic.TopicsClient;
-import rs.iggy.user.UsersClient;
+import rs.iggy.clients.blocking.*;
 
 public class IggyHttpClient implements IggyClient {
 

src/main/java/rs/iggy/http/MessagesHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/MessagesHttpClient.java

@@ -1,11 +1,15 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import org.apache.hc.core5.http.message.BasicNameValuePair;
+import rs.iggy.clients.blocking.MessagesClient;
 import rs.iggy.identifier.ConsumerId;
 import rs.iggy.identifier.SingleConsumerId;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;
-import rs.iggy.message.*;
+import rs.iggy.message.MessageToSend;
+import rs.iggy.message.Partitioning;
+import rs.iggy.message.PolledMessages;
+import rs.iggy.message.PollingStrategy;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/rs/iggy/http/ObjectMapperFactory.java → src/main/java/rs/iggy/clients/blocking/http/ObjectMapperFactory.java

@@ -1,4 +1,4 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;

src/main/java/rs/iggy/http/PartitionsHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/PartitionsHttpClient.java

@@ -1,9 +1,9 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import org.apache.hc.core5.http.message.BasicNameValuePair;
+import rs.iggy.clients.blocking.PartitionsClient;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;
-import rs.iggy.partition.PartitionsClient;
 
 class PartitionsHttpClient implements PartitionsClient {
 

src/main/java/rs/iggy/http/StreamsHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/StreamsHttpClient.java

@@ -1,10 +1,10 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import rs.iggy.clients.blocking.StreamsClient;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.stream.StreamBase;
 import rs.iggy.stream.StreamDetails;
-import rs.iggy.stream.StreamsClient;
 import java.util.List;
 
 class StreamsHttpClient implements StreamsClient {

src/main/java/rs/iggy/http/SystemHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/SystemHttpClient.java

@@ -1,10 +1,10 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import rs.iggy.clients.blocking.SystemClient;
 import rs.iggy.system.ClientInfo;
 import rs.iggy.system.ClientInfoDetails;
 import rs.iggy.system.Stats;
-import rs.iggy.system.SystemClient;
 import java.util.List;
 
 class SystemHttpClient implements SystemClient {

src/main/java/rs/iggy/http/TopicsHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/TopicsHttpClient.java

@@ -1,11 +1,11 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import rs.iggy.clients.blocking.TopicsClient;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;
 import rs.iggy.topic.Topic;
 import rs.iggy.topic.TopicDetails;
-import rs.iggy.topic.TopicsClient;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/rs/iggy/http/UsersHttpClient.java → src/main/java/rs/iggy/clients/blocking/http/UsersHttpClient.java

@@ -1,6 +1,7 @@
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import rs.iggy.clients.blocking.UsersClient;
 import rs.iggy.identifier.UserId;
 import rs.iggy.user.*;
 import java.util.List;

src/main/java/rs/iggy/http/error/IggyHttpError.java → src/main/java/rs/iggy/clients/blocking/http/error/IggyHttpError.java

@@ -1,4 +1,4 @@
-package rs.iggy.http.error;
+package rs.iggy.clients.blocking.http.error;
 
 public record IggyHttpError(
         String id,

src/main/java/rs/iggy/http/error/IggyHttpException.java → src/main/java/rs/iggy/clients/blocking/http/error/IggyHttpException.java

@@ -1,4 +1,4 @@
-package rs.iggy.http.error;
+package rs.iggy.clients.blocking.http.error;
 
 public class IggyHttpException extends RuntimeException {
     private final IggyHttpError error;

src/main/java/rs/iggy/http/package-info.java → src/main/java/rs/iggy/clients/blocking/http/package-info.java

@@ -1,4 +1,4 @@
 @NonNullApi
-package rs.iggy.http;
+package rs.iggy.clients.blocking.http;
 
 import rs.iggy.NonNullApi;

src/main/java/rs/iggy/tcp/IggyTcpClient.java → src/main/java/rs/iggy/clients/blocking/tcp/IggyTcpClient.java

@@ -1,16 +1,8 @@
-package rs.iggy.tcp;
+package rs.iggy.clients.blocking.tcp;
 
 import reactor.netty.Connection;
 import reactor.netty.tcp.TcpClient;
-import rs.iggy.IggyClient;
-import rs.iggy.consumergroup.ConsumerGroupsClient;
-import rs.iggy.consumeroffset.ConsumerOffsetsClient;
-import rs.iggy.message.MessagesClient;
-import rs.iggy.partition.PartitionsClient;
-import rs.iggy.stream.StreamsClient;
-import rs.iggy.system.SystemClient;
-import rs.iggy.topic.TopicsClient;
-import rs.iggy.user.UsersClient;
+import rs.iggy.clients.blocking.*;
 
 public class IggyTcpClient implements IggyClient {
 

src/main/java/rs/iggy/tcp/UsersTcpClient.java → src/main/java/rs/iggy/clients/blocking/tcp/UsersTcpClient.java

@@ -1,9 +1,10 @@
-package rs.iggy.tcp;
+package rs.iggy.clients.blocking.tcp;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import reactor.core.publisher.Mono;
 import reactor.netty.Connection;
+import rs.iggy.clients.blocking.UsersClient;
 import rs.iggy.identifier.UserId;
 import rs.iggy.user.*;
 import java.util.List;

src/main/java/rs/iggy/tcp/package-info.java → src/main/java/rs/iggy/clients/blocking/tcp/package-info.java

@@ -1,4 +1,4 @@
 @NonNullApi
-package rs.iggy.tcp;
+package rs.iggy.clients.blocking.tcp;
 
 import rs.iggy.NonNullApi;

src/test/java/rs/iggy/consumergroup/ConsumerGroupsClientBaseTest.java → src/test/java/rs/iggy/clients/blocking/ConsumerGroupsClientBaseTest.java

@@ -1,8 +1,8 @@
-package rs.iggy.consumergroup;
+package rs.iggy.clients.blocking;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import rs.iggy.IntegrationTest;
+import rs.iggy.consumergroup.ConsumerGroup;
 import rs.iggy.identifier.ConsumerGroupId;
 import rs.iggy.identifier.StreamId;
 import rs.iggy.identifier.TopicId;

src/test/java/rs/iggy/IntegrationTest.java → src/test/java/rs/iggy/clients/blocking/IntegrationTest.java

@@ -1,4 +1,4 @@
-package rs.iggy;
+package rs.iggy.clients.blocking;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.testcontainers.containers.GenericContainer;

src/test/java/rs/iggy/message/MessagesClientBaseTest.java → src/test/java/rs/iggy/clients/blocking/MessagesClientBaseTest.java

@@ -1,8 +1,11 @@
-package rs.iggy.message;
+package rs.iggy.clients.blocking;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import rs.iggy.IntegrationTest;
+import rs.iggy.message.MessageToSend;
+import rs.iggy.message.Partitioning;
+import rs.iggy.message.PollingKind;
+import rs.iggy.message.PollingStrategy;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.List;

src/test/java/rs/iggy/partition/PartitionsClientBaseTest.java → src/test/java/rs/iggy/clients/blocking/PartitionsClientBaseTest.java

@@ -1,10 +1,8 @@
-package rs.iggy.partition;
+package rs.iggy.clients.blocking;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import rs.iggy.IntegrationTest;
 import rs.iggy.topic.TopicDetails;
-import rs.iggy.topic.TopicsClient;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class PartitionsClientBaseTest extends IntegrationTest {

src/test/java/rs/iggy/stream/StreamClientBaseTest.java → src/test/java/rs/iggy/clients/blocking/StreamClientBaseTest.java

@@ -1,8 +1,7 @@
-package rs.iggy.stream;
+package rs.iggy.clients.blocking;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import rs.iggy.IntegrationTest;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class StreamClientBaseTest extends IntegrationTest {

src/test/java/rs/iggy/topic/TopicsClientBaseTest.java → src/test/java/rs/iggy/clients/blocking/TopicsClientBaseTest.java

@@ -1,8 +1,7 @@
-package rs.iggy.topic;
+package rs.iggy.clients.blocking;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import rs.iggy.IntegrationTest;
 import static java.util.Optional.empty;
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/rs/iggy/user/UsersClientBaseTest.java → src/test/java/rs/iggy/clients/blocking/UsersClientBaseTest.java

@@ -1,8 +1,7 @@
-package rs.iggy.user;
+package rs.iggy.clients.blocking;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import rs.iggy.IntegrationTest;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class UsersClientBaseTest extends IntegrationTest {