Skip to content

Commit 690eb4c

Browse files
Stanchev Aleksandarthjaeckle
Stanchev Aleksandar
authored andcommitted
Minor code review fixes
Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
1 parent 19c2ec5 commit 690eb4c

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

java/src/main/java/org/eclipse/ditto/client/live/Live.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public interface Live extends CommonManagement<LiveThingHandle, LiveFeatureHandl
7272
*
7373
* @param <T> the type of the Message's payload.
7474
* @param options options sent to the outbound message.
75-
* @param options options sent to the outbound message.
7675
* @return a new message builder that offers the functionality to create and send the message.
7776
* @since 3.1.0
7877
*/

java/src/main/java/org/eclipse/ditto/client/live/internal/LiveFeatureHandleImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public <T> PendingMessageWithFeatureId<T> message() {
9393
@Override
9494
public <T> PendingMessageWithFeatureId<T> message(final Option<?>... options) {
9595
return PendingMessageImpl.<T>of(LOGGER, outgoingMessageFactory, messageSerializerRegistry, PROTOCOL_ADAPTER,
96-
messagingProvider).withThingAndFeatureIds(getEntityId(), getFeatureId());
96+
messagingProvider, options).withThingAndFeatureIds(getEntityId(), getFeatureId());
9797
}
9898

9999
@Override

java/src/main/java/org/eclipse/ditto/client/live/internal/LiveImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public <T> PendingMessage<T> message() {
228228
@Override
229229
public <T> PendingMessage<T> message(final Option<?>... options) {
230230
return PendingMessageImpl.of(LOGGER, outgoingMessageFactory, messageSerializerRegistry, PROTOCOL_ADAPTER,
231-
messagingProvider);
231+
messagingProvider, options);
232232
}
233233

234234
@Override

java/src/main/java/org/eclipse/ditto/client/live/internal/LiveThingHandleImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public <T> PendingMessageWithThingId<T> message() {
102102
@Override
103103
public <T> PendingMessageWithThingId<T> message(final Option<?>... options) {
104104
return PendingMessageImpl.<T>of(LOGGER, outgoingMessageFactory, messageSerializerRegistry, PROTOCOL_ADAPTER,
105-
messagingProvider).withThingId(getEntityId());
105+
messagingProvider, options).withThingId(getEntityId());
106106
}
107107

108108
@Override

java/src/main/java/org/eclipse/ditto/client/live/internal/PendingMessageImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ static <T> PendingMessageImpl<T> of(final Logger logger,
6464
final OutgoingMessageFactory outgoingMessageFactory,
6565
final MessageSerializerRegistry messageSerializerRegistry,
6666
final ProtocolAdapter protocolAdapter,
67-
final MessagingProvider messagingProvider) {
67+
final MessagingProvider messagingProvider,
68+
final Option<?>... options) {
6869

6970
return new PendingMessageImpl<>(logger, outgoingMessageFactory, messageSerializerRegistry, protocolAdapter,
70-
messagingProvider);
71+
messagingProvider, options);
7172
}
7273

7374
PendingMessageWithThingId<T> withThingId(final ThingId thingId) {

java/src/test/java/org/eclipse/ditto/client/internal/OutgoingMessageFactoryTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,13 @@
1919
import org.assertj.core.api.JUnitSoftAssertions;
2020
import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
2121
import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
22-
import org.eclipse.ditto.client.live.messages.MessageSerializerRegistry;
23-
import org.eclipse.ditto.client.live.messages.MessageSerializers;
2422
import org.eclipse.ditto.client.live.messages.internal.DefaultMessageSerializerRegistry;
2523
import org.eclipse.ditto.client.options.OptionName;
2624
import org.eclipse.ditto.client.options.Options;
27-
import org.eclipse.ditto.json.JsonObject;
2825
import org.eclipse.ditto.messages.model.Message;
2926
import org.eclipse.ditto.messages.model.MessageDirection;
3027
import org.eclipse.ditto.messages.model.MessageHeaders;
3128
import org.eclipse.ditto.messages.model.MessagesModelFactory;
32-
import org.eclipse.ditto.messages.model.signals.commands.SendThingMessage;
33-
import org.eclipse.ditto.things.model.ThingId;
3429
import org.eclipse.ditto.things.model.signals.commands.query.RetrieveFeature;
3530
import org.junit.Before;
3631
import org.junit.Rule;
@@ -92,7 +87,7 @@ public void deleteThingWithLiveChannelConditionExpressionThrowsException() {
9287
}
9388

9489
@Test
95-
public void LiveMessageWithOnlyAllowedOptionsReturnsExpected() {
90+
public void liveMessageWithOnlyAllowedOptionsReturnsExpected() {
9691
final Message<?> liveMessage = underTest.sendMessage(new DefaultMessageSerializerRegistry(), getMessage(),
9792
Options.condition(CONDITION_EXPRESSION));
9893

0 commit comments

Comments
 (0)