remove @nullable annotation from proxyActor ref;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Oct 11, 2021 · 05fe802 · 05fe802
1 parent 522e7cf
commit 05fe802
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 29 deletions.
diff --git a/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java b/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
@@ -214,8 +214,7 @@ public abstract class BaseClientActor extends AbstractFSMWithStash<BaseClientSta
     private int childActorCount = 0;
 
     protected BaseClientActor(final Connection connection,
-            //TODO check if @Nullable can be removed
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor,
             final DittoHeaders dittoHeaders) {
 

diff --git a/...c/main/java/org/eclipse/ditto/connectivity/service/messaging/ClientActorPropsFactory.java b/...c/main/java/org/eclipse/ditto/connectivity/service/messaging/ClientActorPropsFactory.java
@@ -12,8 +12,6 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging;
 
-import javax.annotation.Nullable;
-
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.connectivity.model.Connection;
 
@@ -36,7 +34,7 @@ public interface ClientActorPropsFactory {
      * @param dittoHeaders Ditto headers of the command that caused the client actors to be created.
      * @return the actor props
      */
-    Props getActorPropsForType(Connection connection, @Nullable ActorRef proxyActor, ActorRef connectionActor,
+    Props getActorPropsForType(Connection connection, ActorRef proxyActor, ActorRef connectionActor,
             ActorSystem actorSystem, final DittoHeaders dittoHeaders);
 
 }
diff --git a/...java/org/eclipse/ditto/connectivity/service/messaging/DefaultClientActorPropsFactory.java b/...java/org/eclipse/ditto/connectivity/service/messaging/DefaultClientActorPropsFactory.java
@@ -12,7 +12,6 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
@@ -48,7 +47,7 @@ public static DefaultClientActorPropsFactory getInstance() {
     }
 
     @Override
-    public Props getActorPropsForType(final Connection connection, @Nullable final ActorRef proxyActor,
+    public Props getActorPropsForType(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final ActorSystem actorSystem,
             final DittoHeaders dittoHeaders) {
         final ConnectionType connectionType = connection.getConnectionType();

diff --git a/.../src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpClientActor.java b/.../src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpClientActor.java
@@ -121,7 +121,7 @@ public final class AmqpClientActor extends BaseClientActor implements ExceptionL
      */
     @SuppressWarnings("unused")
     private AmqpClientActor(final Connection connection,
-            @Nullable final ActorRef proxyActor,
+            ActorRef proxyActor,
             final ActorRef connectionActor,
             final Config amqp10configOverride,
             final DittoHeaders dittoHeaders) {
@@ -152,7 +152,7 @@ private AmqpClientActor(final Connection connection,
     @SuppressWarnings("unused")
     private AmqpClientActor(final Connection connection,
             final JmsConnectionFactory jmsConnectionFactory,
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor, final DittoHeaders dittoHeaders) {
 
         super(connection, proxyActor, connectionActor, dittoHeaders);
@@ -176,7 +176,7 @@ private AmqpClientActor(final Connection connection,
      * @param dittoHeaders headers of the command that caused this actor to be created.
      * @return the Akka configuration Props object.
      */
-    public static Props props(final Connection connection, @Nullable final ActorRef proxyActor,
+    public static Props props(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final ActorSystem actorSystem,
             final DittoHeaders dittoHeaders) {
 
@@ -196,7 +196,7 @@ public static Props props(final Connection connection, @Nullable final ActorRef
      * @param dittoHeaders headers of the command that caused this actor to be created.
      * @return the Akka configuration Props object.
      */
-    public static Props props(final Connection connection, @Nullable final ActorRef proxyActor,
+    public static Props props(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final Config amqp10configOverride, final ActorSystem actorSystem,
             final DittoHeaders dittoHeaders) {
 

diff --git a/...n/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushClientActor.java b/...n/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushClientActor.java
@@ -58,8 +58,7 @@ public final class HttpPushClientActor extends BaseClientActor {
     private final HttpPushFactory factory;
     private final ConnectionLogger connectionLogger;
 
-    @Nullable
-    private ActorRef httpPublisherActor;
+    @Nullable private ActorRef httpPublisherActor;
     private final HttpPushConfig httpPushConfig;
 
     @SuppressWarnings("unused")

diff --git a/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaClientActor.java b/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/kafka/KafkaClientActor.java
@@ -63,7 +63,7 @@ public final class KafkaClientActor extends BaseClientActor {
     private final KafkaConfig kafkaConfig;
 
     private KafkaClientActor(final Connection connection,
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor,
             final KafkaPublisherActorFactory publisherActorFactory,
             final DittoHeaders dittoHeaders) {
@@ -79,7 +79,7 @@ private KafkaClientActor(final Connection connection,
 
     @SuppressWarnings("unused") // used by `props` via reflection
     private KafkaClientActor(final Connection connection,
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor,
             final DittoHeaders dittoHeaders) {
 
@@ -96,7 +96,7 @@ private KafkaClientActor(final Connection connection,
      * @return the Akka configuration Props object.
      */
     public static Props props(final Connection connection,
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor,
             final DittoHeaders dittoHeaders) {
 
@@ -105,7 +105,7 @@ public static Props props(final Connection connection,
     }
 
     static Props propsForTests(final Connection connection,
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor,
             final KafkaPublisherActorFactory factory,
             final DittoHeaders dittoHeaders) {

diff --git a/...org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/AbstractMqttClientActor.java b/...org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/AbstractMqttClientActor.java
@@ -85,7 +85,7 @@ abstract class AbstractMqttClientActor<S, P, Q extends MqttClient, R> extends Ba
     @Nullable private ActorRef publisherActor;
     private final MqttConfig mqttConfig;
 
-    AbstractMqttClientActor(final Connection connection, @Nullable final ActorRef proxyActor,
+    AbstractMqttClientActor(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final DittoHeaders dittoHeaders) {
         super(connection, proxyActor, connectionActor, dittoHeaders);
         this.connection = connection;

diff --git a/...va/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/HiveMqtt3ClientActor.java b/...va/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/HiveMqtt3ClientActor.java
@@ -46,7 +46,7 @@ public final class HiveMqtt3ClientActor
 
     @SuppressWarnings("unused") // used by `props` via reflection
     private HiveMqtt3ClientActor(final Connection connection,
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor,
             final HiveMqtt3ClientFactory clientFactory,
             final DittoHeaders dittoHeaders) {
@@ -55,7 +55,7 @@ private HiveMqtt3ClientActor(final Connection connection,
     }
 
     @SuppressWarnings("unused") // used by `props` via reflection
-    private HiveMqtt3ClientActor(final Connection connection, @Nullable final ActorRef proxyActor,
+    private HiveMqtt3ClientActor(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final DittoHeaders dittoHeaders) {
         super(connection, proxyActor, connectionActor, dittoHeaders);
         clientFactory = DefaultHiveMqtt3ClientFactory.getInstance(this::getSshTunnelState);
@@ -76,7 +76,7 @@ private HiveMqtt3ClientActor(final Connection connection, @Nullable final ActorR
      * @param dittoHeaders headers of the command that caused this actor to be created.
      * @return the Akka configuration Props object.
      */
-    public static Props props(final Connection connection, @Nullable final ActorRef proxyActor,
+    public static Props props(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final HiveMqtt3ClientFactory clientFactory,
             final DittoHeaders dittoHeaders) {
         return Props.create(HiveMqtt3ClientActor.class, connection, proxyActor, connectionActor, clientFactory,
@@ -92,7 +92,7 @@ public static Props props(final Connection connection, @Nullable final ActorRef
      * @param dittoHeaders headers of the command that caused this actor to be created.
      * @return the Akka configuration Props object.
      */
-    public static Props props(final Connection connection, @Nullable final ActorRef proxyActor,
+    public static Props props(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final DittoHeaders dittoHeaders) {
         return Props.create(HiveMqtt3ClientActor.class, connection, proxyActor, connectionActor, dittoHeaders);
     }

diff --git a/...va/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/HiveMqtt5ClientActor.java b/...va/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/HiveMqtt5ClientActor.java
@@ -95,7 +95,7 @@ public static Props props(final Connection connection, final ActorRef proxyActor
      * @param dittoHeaders headers of the command that caused this actor to be created.
      * @return the Akka configuration Props object.
      */
-    public static Props props(final Connection connection, @Nullable final ActorRef proxyActor,
+    public static Props props(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final DittoHeaders dittoHeaders) {
         return Props.create(HiveMqtt5ClientActor.class, connection, proxyActor, connectionActor, dittoHeaders);
     }

diff --git a/...n/java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQClientActor.java b/...n/java/org/eclipse/ditto/connectivity/service/messaging/rabbitmq/RabbitMQClientActor.java
@@ -92,7 +92,7 @@ public final class RabbitMQClientActor extends BaseClientActor {
      */
     @SuppressWarnings("unused")
     private RabbitMQClientActor(final Connection connection,
-            @Nullable final ActorRef proxyActor,
+            final ActorRef proxyActor,
             final ActorRef connectionActor, final DittoHeaders dittoHeaders) {
 
         super(connection, proxyActor, connectionActor, dittoHeaders);
@@ -109,7 +109,7 @@ private RabbitMQClientActor(final Connection connection,
      * This constructor is called via reflection by the static method props(Connection, ActorRef).
      */
     @SuppressWarnings("unused")
-    private RabbitMQClientActor(final Connection connection, @Nullable final ActorRef proxyActor,
+    private RabbitMQClientActor(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final RabbitConnectionFactoryFactory rabbitConnectionFactoryFactory,
             final DittoHeaders dittoHeaders) {
 
@@ -130,7 +130,7 @@ private RabbitMQClientActor(final Connection connection, @Nullable final ActorRe
      * @param dittoHeaders headers of the command that caused this actor to be created.
      * @return the Akka configuration Props object.
      */
-    public static Props props(final Connection connection, @Nullable final ActorRef proxyActor,
+    public static Props props(final Connection connection, final ActorRef proxyActor,
             final ActorRef connectionActor, final DittoHeaders dittoHeaders) {
 
         return Props.create(RabbitMQClientActor.class, validateConnection(connection), proxyActor,

diff --git a/...e/src/test/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActorTest.java b/...e/src/test/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActorTest.java
@@ -681,7 +681,7 @@ private static final class DummyClientActor extends BaseClientActor {
 
         public DummyClientActor(final Connection connection,
                 final ActorRef connectionActor,
-                @Nullable final ActorRef proxyActor,
+                final ActorRef proxyActor,
                 final ActorRef publisherActor,
                 final BaseClientActor delegate) {
 
@@ -700,7 +700,7 @@ public DummyClientActor(final Connection connection,
          * @return the Akka configuration Props object.
          */
         public static Props props(final Connection connection, final ActorRef connectionActor,
-                @Nullable final ActorRef proxyActor,
+                final ActorRef proxyActor,
                 final ActorRef publisherActor, final BaseClientActor delegate) {
             return Props.create(DummyClientActor.class, connection, connectionActor, proxyActor,
                     publisherActor, delegate);

diff --git a/...ipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java b/...ipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
@@ -1272,7 +1272,7 @@ public FailingActorProvider(final int retriesUntilSuccess) {
         }
 
         @Override
-        public Props getActorPropsForType(final Connection connection, @Nullable final ActorRef proxyActor,
+        public Props getActorPropsForType(final Connection connection, final ActorRef proxyActor,
                 final ActorRef connectionActor, final ActorSystem system,
                 final DittoHeaders dittoHeaders) {
             return Props.create(FailingActor.class, FailingActor::new);