Fix a potential NPE and remove extra "for..." methods for pubsub and topic.

Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com>

Author: artur-ciocanu

testcontainers-dapr/src/main/java/io/dapr/testcontainers/wait/strategy/ActorWaitStrategy.java

@@ -49,7 +49,7 @@ protected boolean isConditionMet(Metadata metadata) {
   }
 
   private boolean matchesActorType(Actor actor) {
-    return actorType.equals(actor.getType());
+    return actor != null && actorType.equals(actor.getType());
   }
 
   @Override

testcontainers-dapr/src/main/java/io/dapr/testcontainers/wait/strategy/DaprWait.java

@@ -51,34 +51,14 @@ private DaprWait() {
   /**
    * Creates a wait strategy that waits for a subscription to be registered.
    *
-   * @param pubsubName the name of the pub/sub component
-   * @param topic the topic name to wait for
+   * @param pubsubName the name of the pub/sub component (can be null to match any)
+   * @param topic the topic name to wait for (can be null to match any)
    * @return a new subscription wait strategy
    */
   public static SubscriptionWaitStrategy forSubscription(String pubsubName, String topic) {
     return new SubscriptionWaitStrategy(pubsubName, topic);
   }
 
-  /**
-   * Creates a wait strategy that waits for any subscription on a pub/sub component.
-   *
-   * @param pubsubName the name of the pub/sub component
-   * @return a new subscription wait strategy
-   */
-  public static SubscriptionWaitStrategy forPubSub(String pubsubName) {
-    return new SubscriptionWaitStrategy(pubsubName, null);
-  }
-
-  /**
-   * Creates a wait strategy that waits for a subscription on a specific topic.
-   *
-   * @param topic the topic name to wait for
-   * @return a new subscription wait strategy
-   */
-  public static SubscriptionWaitStrategy forTopic(String topic) {
-    return new SubscriptionWaitStrategy(null, topic);
-  }
-
   /**
    * Creates a wait strategy that waits for any actors to be registered.
    *

testcontainers-dapr/src/test/java/io/dapr/testcontainers/wait/strategy/ActorWaitStrategyTest.java

@@ -101,6 +101,16 @@ void shouldProvideCorrectDescription() {
     assertEquals("actor type 'MyActor'", specificActor.getConditionDescription());
   }
 
+  @Test
+  @DisplayName("Should handle null actor in list without throwing NPE")
+  void shouldHandleNullActorInList() {
+    ActorWaitStrategy strategy = new ActorWaitStrategy("TargetActor");
+    Metadata metadata = new Metadata();
+    metadata.setActors(Arrays.asList(null, createActor("TargetActor")));
+
+    assertTrue(strategy.isConditionMet(metadata));
+  }
+
   private Metadata createMetadataWithActor(String actorType) {
     Metadata metadata = new Metadata();
     metadata.setActors(Collections.singletonList(createActor(actorType)));

testcontainers-dapr/src/test/java/io/dapr/testcontainers/wait/strategy/DaprWaitTest.java

@@ -38,18 +38,18 @@ void forSubscriptionShouldCreateSubscriptionWaitStrategy() {
   }
 
   @Test
-  @DisplayName("forPubSub should create SubscriptionWaitStrategy with null topic")
-  void forPubSubShouldCreateSubscriptionWaitStrategyWithNullTopic() {
-    SubscriptionWaitStrategy strategy = DaprWait.forPubSub("pubsub");
+  @DisplayName("forSubscription with null topic should match any topic")
+  void forSubscriptionWithNullTopicShouldMatchAnyTopic() {
+    SubscriptionWaitStrategy strategy = DaprWait.forSubscription("pubsub", null);
 
     assertNotNull(strategy);
     assertEquals("subscription for pubsub 'pubsub'", strategy.getConditionDescription());
   }
 
   @Test
-  @DisplayName("forTopic should create SubscriptionWaitStrategy with null pubsub")
-  void forTopicShouldCreateSubscriptionWaitStrategyWithNullPubsub() {
-    SubscriptionWaitStrategy strategy = DaprWait.forTopic("orders");
+  @DisplayName("forSubscription with null pubsub should match any pubsub")
+  void forSubscriptionWithNullPubsubShouldMatchAnyPubsub() {
+    SubscriptionWaitStrategy strategy = DaprWait.forSubscription(null, "orders");
 
     assertNotNull(strategy);
     assertEquals("subscription for topic 'orders'", strategy.getConditionDescription());