Use explicit includes per reviewer feedback and moved UMessageBuilder…

… to transport
eclipse-uprotocol · May 22, 2024 · 961e0d3 · 961e0d3
1 parent 49eede9
commit 961e0d3
Show file tree

Hide file tree

Showing 23 changed files with 90 additions and 27 deletions.
diff --git a/src/main/java/org/eclipse/uprotocol/client/CallOptions.java b/src/main/java/org/eclipse/uprotocol/client/CallOptions.java
@@ -12,7 +12,8 @@
  */
  package org.eclipse.uprotocol.client;
 
- import org.eclipse.uprotocol.v1.*;
+ import org.eclipse.uprotocol.v1.UPriority;
+
 
  import java.util.Objects;
  import java.util.Optional;

diff --git a/src/main/java/org/eclipse/uprotocol/client/Notifier.java b/src/main/java/org/eclipse/uprotocol/client/Notifier.java
@@ -12,11 +12,14 @@
  */
 package org.eclipse.uprotocol.client;
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UStatus;
+import org.eclipse.uprotocol.v1.UUri;
+
 
 import java.util.Optional;
 
 import org.eclipse.uprotocol.transport.UListener;
+import org.eclipse.uprotocol.transport.builder.UMessageBuilder;
 
 import com.google.protobuf.Message;
 

diff --git a/src/main/java/org/eclipse/uprotocol/client/Publisher.java b/src/main/java/org/eclipse/uprotocol/client/Publisher.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.uprotocol.client;
 
+import org.eclipse.uprotocol.transport.builder.UMessageBuilder;
 import org.eclipse.uprotocol.v1.UPayloadFormat;
 import org.eclipse.uprotocol.v1.UStatus;
 import org.eclipse.uprotocol.v1.UUri;

diff --git a/src/main/java/org/eclipse/uprotocol/client/RequestListener.java b/src/main/java/org/eclipse/uprotocol/client/RequestListener.java
@@ -15,7 +15,11 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.eclipse.uprotocol.transport.UListener;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.transport.builder.UMessageBuilder;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UMessageType;
+
 
 /**
  * uService (servers) implement this to receive requests messages from clients. <br>

diff --git a/src/main/java/org/eclipse/uprotocol/client/RpcClient.java b/src/main/java/org/eclipse/uprotocol/client/RpcClient.java
@@ -23,7 +23,13 @@
 package org.eclipse.uprotocol.client;
 
 import org.eclipse.uprotocol.transport.UListener;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.transport.builder.UMessageBuilder;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UPayloadFormat;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UUri;
+import org.eclipse.uprotocol.v1.UStatus;
 
 import com.google.protobuf.Message;
 

diff --git a/src/main/java/org/eclipse/uprotocol/client/RpcMapper.java b/src/main/java/org/eclipse/uprotocol/client/RpcMapper.java
@@ -19,7 +19,8 @@
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UStatus;
+import org.eclipse.uprotocol.v1.UCode;
 
 /**
  * RPC Wrapper is an interface that provides static methods to be able to wrap an RPC request with 

diff --git a/src/main/java/org/eclipse/uprotocol/client/RpcServer.java b/src/main/java/org/eclipse/uprotocol/client/RpcServer.java
@@ -15,7 +15,8 @@
 import java.util.Optional;
 
 import org.eclipse.uprotocol.uri.factory.UriFactory;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UStatus;
+import org.eclipse.uprotocol.v1.UUri;
 
 /**
  * RpcServer is an interface called by uServices to register method listeners for incoming RPC requests

diff --git a/src/main/java/org/eclipse/uprotocol/client/UPayload.java b/src/main/java/org/eclipse/uprotocol/client/UPayload.java
@@ -1,6 +1,6 @@
 package org.eclipse.uprotocol.client;
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UPayloadFormat;
 
 import java.util.Optional;
 

diff --git a/src/main/java/org/eclipse/uprotocol/client/UStatusException.java b/src/main/java/org/eclipse/uprotocol/client/UStatusException.java
@@ -13,7 +13,8 @@
 package org.eclipse.uprotocol.client;
 
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UStatus;
+import org.eclipse.uprotocol.v1.UCode;
 
 
 /**

diff --git a/src/main/java/org/eclipse/uprotocol/cloudevent/factory/UCloudEvent.java b/src/main/java/org/eclipse/uprotocol/cloudevent/factory/UCloudEvent.java
@@ -12,7 +12,7 @@
  */
 package org.eclipse.uprotocol.cloudevent.factory;
 
-import org.eclipse.uprotocol.v1.Uoptions;
+import org.eclipse.uprotocol.Uoptions;
 import org.eclipse.uprotocol.uri.serializer.UriSerializer;
 import org.eclipse.uprotocol.uuid.factory.UuidUtils;
 import org.eclipse.uprotocol.uuid.serializer.UuidSerializer;
@@ -25,7 +25,14 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.CloudEventData;
 import io.cloudevents.core.builder.CloudEventBuilder;
-import org.eclipse.uprotocol.v1.*;
+
+import org.eclipse.uprotocol.v1.UAttributes;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UPayloadFormat;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UUID;
 
 import java.net.URI;
 import java.time.OffsetDateTime;

diff --git a/src/main/java/org/eclipse/uprotocol/cloudevent/validate/CloudEventValidator.java b/src/main/java/org/eclipse/uprotocol/cloudevent/validate/CloudEventValidator.java
@@ -15,7 +15,7 @@
 
 import io.cloudevents.CloudEvent;
 import org.eclipse.uprotocol.cloudevent.factory.UCloudEvent;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UUri;
 import org.eclipse.uprotocol.validation.ValidationResult;
 import org.eclipse.uprotocol.uri.serializer.UriSerializer;
 import org.eclipse.uprotocol.uri.validator.UriValidator;

diff --git a/src/main/java/org/eclipse/uprotocol/transport/UListener.java b/src/main/java/org/eclipse/uprotocol/transport/UListener.java
@@ -12,7 +12,7 @@
  */
 package org.eclipse.uprotocol.transport;
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UMessage;
 
 /**
  * For any implementation that defines some kind of callback or function that will be called to handle incoming messages.

diff --git a/src/main/java/org/eclipse/uprotocol/transport/UTransport.java b/src/main/java/org/eclipse/uprotocol/transport/UTransport.java
@@ -14,7 +14,9 @@
 
 import java.util.Optional;
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UStatus;
+import org.eclipse.uprotocol.v1.UUri;
 
 /**
  * UTransport is the uP-L1 interface that provides a common API for uE developers to send and receive messages.

diff --git a/...pse/uprotocol/client/UMessageBuilder.java → ...ol/transport/builder/UMessageBuilder.java b/...pse/uprotocol/client/UMessageBuilder.java → ...ol/transport/builder/UMessageBuilder.java
@@ -10,10 +10,17 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.eclipse.uprotocol.client;
+package org.eclipse.uprotocol.transport.builder;
 
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UUri;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UAttributes;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UPayloadFormat;
+import org.eclipse.uprotocol.v1.UUID;
 
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;

diff --git a/src/main/java/org/eclipse/uprotocol/transport/validate/UAttributesValidator.java b/src/main/java/org/eclipse/uprotocol/transport/validate/UAttributesValidator.java
@@ -15,7 +15,11 @@
 
 import org.eclipse.uprotocol.uri.validator.UriValidator;
 import org.eclipse.uprotocol.uuid.factory.UuidUtils;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UAttributes;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UUri;
+import org.eclipse.uprotocol.v1.UUID;
 import org.eclipse.uprotocol.validation.ValidationResult;
 
 import java.util.Objects;

diff --git a/src/main/java/org/eclipse/uprotocol/uri/factory/UriFactory.java b/src/main/java/org/eclipse/uprotocol/uri/factory/UriFactory.java
@@ -1,6 +1,6 @@
 package org.eclipse.uprotocol.uri.factory;
 
-import org.eclipse.uprotocol.v1.Uoptions;
+import org.eclipse.uprotocol.Uoptions;
 import org.eclipse.uprotocol.v1.UUri;
 
 import com.google.protobuf.DescriptorProtos.ServiceOptions;

diff --git a/src/test/java/org/eclipse/uprotocol/client/TestUTransport.java b/src/test/java/org/eclipse/uprotocol/client/TestUTransport.java
@@ -13,9 +13,9 @@
 
 package org.eclipse.uprotocol.client;
 
-import org.eclipse.uprotocol.client.UMessageBuilder;
 import org.eclipse.uprotocol.transport.UListener;
 import org.eclipse.uprotocol.transport.UTransport;
+import org.eclipse.uprotocol.transport.builder.UMessageBuilder;
 import org.eclipse.uprotocol.transport.validate.UAttributesValidator;
 import org.eclipse.uprotocol.v1.UCode;
 import org.eclipse.uprotocol.v1.UMessage;

diff --git a/src/test/java/org/eclipse/uprotocol/cloudevent/factory/CloudEventFactoryTest.java b/src/test/java/org/eclipse/uprotocol/cloudevent/factory/CloudEventFactoryTest.java
@@ -17,7 +17,10 @@
 import io.cloudevents.core.builder.CloudEventBuilder;
 import org.eclipse.uprotocol.cloudevent.datamodel.UCloudEventAttributes;
 import org.eclipse.uprotocol.uri.serializer.UriSerializer;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UUri;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 

diff --git a/src/test/java/org/eclipse/uprotocol/cloudevent/factory/UCloudEventTest.java b/src/test/java/org/eclipse/uprotocol/cloudevent/factory/UCloudEventTest.java
@@ -18,12 +18,19 @@
 import io.cloudevents.CloudEventData;
 import io.cloudevents.core.builder.CloudEventBuilder;
 
-import org.eclipse.uprotocol.client.UMessageBuilder;
 import org.eclipse.uprotocol.cloudevent.datamodel.UCloudEventAttributes;
+import org.eclipse.uprotocol.transport.builder.UMessageBuilder;
 import org.eclipse.uprotocol.uri.serializer.UriSerializer;
 import org.eclipse.uprotocol.uuid.factory.UuidFactory;
 import org.eclipse.uprotocol.uuid.serializer.UuidSerializer;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UUri;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UUID;
+import org.eclipse.uprotocol.v1.UPayloadFormat;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/...t/java/org/eclipse/uprotocol/cloudevent/serialize/CloudEventToProtobufSerializerTest.java b/...t/java/org/eclipse/uprotocol/cloudevent/serialize/CloudEventToProtobufSerializerTest.java
@@ -21,7 +21,9 @@
 import org.eclipse.uprotocol.cloudevent.factory.CloudEventFactory;
 import org.eclipse.uprotocol.cloudevent.factory.UCloudEvent;
 import org.eclipse.uprotocol.uri.serializer.UriSerializer;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UUri;
+import org.eclipse.uprotocol.v1.UMessageType;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 

diff --git a/src/test/java/org/eclipse/uprotocol/cloudevent/validate/CloudEventValidatorTest.java b/src/test/java/org/eclipse/uprotocol/cloudevent/validate/CloudEventValidatorTest.java
@@ -22,7 +22,14 @@
 import org.eclipse.uprotocol.uri.serializer.UriSerializer;
 import org.eclipse.uprotocol.uuid.factory.UuidFactory;
 import org.eclipse.uprotocol.uuid.serializer.UuidSerializer;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UUri;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UUID;
+import org.eclipse.uprotocol.v1.UPayloadFormat;
+import org.eclipse.uprotocol.v1.UStatus;
 import org.eclipse.uprotocol.validation.ValidationResult;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/org/eclipse/uprotocol/transport/builder/UMessageBuilderTest.java b/src/test/java/org/eclipse/uprotocol/transport/builder/UMessageBuilderTest.java
@@ -12,9 +12,15 @@
  */
 package org.eclipse.uprotocol.transport.builder;
 
-import org.eclipse.uprotocol.client.UMessageBuilder;
-import org.eclipse.uprotocol.client.UPayload;
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UCode;
+import org.eclipse.uprotocol.v1.UPriority;
+import org.eclipse.uprotocol.v1.UUri;
+import org.eclipse.uprotocol.v1.UMessage;
+import org.eclipse.uprotocol.v1.UMessageType;
+import org.eclipse.uprotocol.v1.UUID;
+import org.eclipse.uprotocol.v1.UPayloadFormat;
+import org.eclipse.uprotocol.v1.UAttributes;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 

diff --git a/src/test/java/org/eclipse/uprotocol/uuid/factory/UuidUtilsTest.java b/src/test/java/org/eclipse/uprotocol/uuid/factory/UuidUtilsTest.java
@@ -12,7 +12,7 @@
  */
 package org.eclipse.uprotocol.uuid.factory;
 
-import org.eclipse.uprotocol.v1.*;
+import org.eclipse.uprotocol.v1.UUID;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;