Minor code review fixes

Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
eclipse-ditto · Jan 5, 2023 · 690eb4c · 690eb4c
1 parent 19c2ec5
commit 690eb4c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/java/src/main/java/org/eclipse/ditto/client/live/Live.java b/java/src/main/java/org/eclipse/ditto/client/live/Live.java
@@ -72,7 +72,6 @@ public interface Live extends CommonManagement<LiveThingHandle, LiveFeatureHandl
      *
      * @param <T> the type of the Message's payload.
      * @param options options sent to the outbound message.
-     * @param options options sent to the outbound message.
      * @return a new message builder that offers the functionality to create and send the message.
      * @since 3.1.0
      */

diff --git a/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveFeatureHandleImpl.java b/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveFeatureHandleImpl.java
@@ -93,7 +93,7 @@ public <T> PendingMessageWithFeatureId<T> message() {
     @Override
     public <T> PendingMessageWithFeatureId<T> message(final Option<?>... options) {
         return PendingMessageImpl.<T>of(LOGGER, outgoingMessageFactory, messageSerializerRegistry, PROTOCOL_ADAPTER,
-                messagingProvider).withThingAndFeatureIds(getEntityId(), getFeatureId());
+                messagingProvider, options).withThingAndFeatureIds(getEntityId(), getFeatureId());
     }
 
     @Override

diff --git a/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveImpl.java b/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveImpl.java
@@ -228,7 +228,7 @@ public <T> PendingMessage<T> message() {
     @Override
     public <T> PendingMessage<T> message(final Option<?>... options) {
         return PendingMessageImpl.of(LOGGER, outgoingMessageFactory, messageSerializerRegistry, PROTOCOL_ADAPTER,
-                messagingProvider);
+                messagingProvider, options);
     }
 
     @Override

diff --git a/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveThingHandleImpl.java b/java/src/main/java/org/eclipse/ditto/client/live/internal/LiveThingHandleImpl.java
@@ -102,7 +102,7 @@ public <T> PendingMessageWithThingId<T> message() {
     @Override
     public <T> PendingMessageWithThingId<T> message(final Option<?>... options) {
         return PendingMessageImpl.<T>of(LOGGER, outgoingMessageFactory, messageSerializerRegistry, PROTOCOL_ADAPTER,
-                messagingProvider).withThingId(getEntityId());
+                messagingProvider, options).withThingId(getEntityId());
     }
 
     @Override

diff --git a/java/src/main/java/org/eclipse/ditto/client/live/internal/PendingMessageImpl.java b/java/src/main/java/org/eclipse/ditto/client/live/internal/PendingMessageImpl.java
@@ -64,10 +64,11 @@ static <T> PendingMessageImpl<T> of(final Logger logger,
             final OutgoingMessageFactory outgoingMessageFactory,
             final MessageSerializerRegistry messageSerializerRegistry,
             final ProtocolAdapter protocolAdapter,
-            final MessagingProvider messagingProvider) {
+            final MessagingProvider messagingProvider,
+            final Option<?>... options) {
 
         return new PendingMessageImpl<>(logger, outgoingMessageFactory, messageSerializerRegistry, protocolAdapter,
-                messagingProvider);
+                messagingProvider, options);
     }
 
     PendingMessageWithThingId<T> withThingId(final ThingId thingId) {

diff --git a/java/src/test/java/org/eclipse/ditto/client/internal/OutgoingMessageFactoryTest.java b/java/src/test/java/org/eclipse/ditto/client/internal/OutgoingMessageFactoryTest.java
@@ -19,18 +19,13 @@
 import org.assertj.core.api.JUnitSoftAssertions;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.client.live.messages.MessageSerializerRegistry;
-import org.eclipse.ditto.client.live.messages.MessageSerializers;
 import org.eclipse.ditto.client.live.messages.internal.DefaultMessageSerializerRegistry;
 import org.eclipse.ditto.client.options.OptionName;
 import org.eclipse.ditto.client.options.Options;
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.messages.model.Message;
 import org.eclipse.ditto.messages.model.MessageDirection;
 import org.eclipse.ditto.messages.model.MessageHeaders;
 import org.eclipse.ditto.messages.model.MessagesModelFactory;
-import org.eclipse.ditto.messages.model.signals.commands.SendThingMessage;
-import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveFeature;
 import org.junit.Before;
 import org.junit.Rule;
@@ -92,7 +87,7 @@ public void deleteThingWithLiveChannelConditionExpressionThrowsException() {
     }
 
     @Test
-    public void LiveMessageWithOnlyAllowedOptionsReturnsExpected() {
+    public void liveMessageWithOnlyAllowedOptionsReturnsExpected() {
         final Message<?> liveMessage = underTest.sendMessage(new DefaultMessageSerializerRegistry(), getMessage(),
                 Options.condition(CONDITION_EXPRESSION));