Fix DefaultClientActorPropsFactoryTest.

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Jul 12, 2022 · fef2fbd · fef2fbd
1 parent c7cda42
commit fef2fbd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/...java/org/eclipse/ditto/connectivity/service/messaging/DefaultClientActorPropsFactory.java b/...java/org/eclipse/ditto/connectivity/service/messaging/DefaultClientActorPropsFactory.java
@@ -77,8 +77,7 @@ public Props getActorPropsForType(final Connection connection,
                     proxyActor,
                     connectionActor,
                     dittoHeaders,
-                    connectivityConfigOverwrites,
-                    GenericMqttClientFactory.newInstance());
+                    connectivityConfigOverwrites);
             case KAFKA -> KafkaClientActor.props(connection,
                     proxyActor,
                     connectionActor,

diff --git a/...in/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/MqttClientActor.java b/...in/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/MqttClientActor.java
@@ -81,6 +81,17 @@ public final class MqttClientActor extends BaseClientActor {
     @Nullable private ActorRef publishingActorRef;
     private final List<ActorRef> mqttConsumerActorRefs;
 
+    @SuppressWarnings("unused") // called by reflection
+    private MqttClientActor(final Connection connection,
+            final ActorRef proxyActor,
+            final ActorRef connectionActor,
+            final DittoHeaders dittoHeaders,
+            final Config connectivityConfigOverwrites) {
+
+        this(connection, proxyActor, connectionActor, dittoHeaders, connectivityConfigOverwrites,
+                GenericMqttClientFactory.newInstance());
+    }
+
     @SuppressWarnings("java:S1144")
     private MqttClientActor(final Connection connection,
             final ActorRef proxyActor,
@@ -112,19 +123,32 @@ private MqttClientActor(final Connection connection,
      * @param connectionActor the connection persistence actor which creates the returned client actor.
      * @param dittoHeaders headers of the command that caused the returned client actor to be created.
      * @param connectivityConfigOverwrites the overwrites of the connectivity config for the given connection.
-     * @param genericMqttClientFactory factory for creating the {@link GenericMqttClient} which is used by the client
      * actor this props create.
      * @return the Props.
      * @throws NullPointerException if any argument is {@code null}.
      */
     public static Props props(final Connection mqttConnection,
+            final ActorRef proxyActor,
+            final ActorRef connectionActor,
+            final DittoHeaders dittoHeaders,
+            final Config connectivityConfigOverwrites) {
+
+        return Props.create(MqttClientActor.class,
+                ConditionChecker.checkNotNull(mqttConnection, "mqttConnection"),
+                ConditionChecker.checkNotNull(proxyActor, "proxyActor"),
+                ConditionChecker.checkNotNull(connectionActor, "connectionActor"),
+                ConditionChecker.checkNotNull(dittoHeaders, "dittoHeaders"),
+                ConditionChecker.checkNotNull(connectivityConfigOverwrites, "connectivityConfigOverwrites"));
+    }
+
+    static Props props(final Connection mqttConnection,
             final ActorRef proxyActor,
             final ActorRef connectionActor,
             final DittoHeaders dittoHeaders,
             final Config connectivityConfigOverwrites,
             final GenericMqttClientFactory genericMqttClientFactory) {
 
-        return  Props.create(MqttClientActor.class,
+        return Props.create(MqttClientActor.class,
                 ConditionChecker.checkNotNull(mqttConnection, "mqttConnection"),
                 ConditionChecker.checkNotNull(proxyActor, "proxyActor"),
                 ConditionChecker.checkNotNull(connectionActor, "connectionActor"),