Do some cleanup

Author: Quinn-With-Two-Ns

temporal-spring-boot-autoconfigure/src/main/java/io/temporal/spring/boot/autoconfigure/AutoConfigurationUtils.java

@@ -11,6 +11,7 @@
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
@@ -96,6 +97,11 @@ static List<WorkerInterceptor> chooseWorkerInterceptors(
     return workerInterceptor;
   }
 
+  /**
+   * Create a comparator that can extract @Order and @Priority from beans in the given bean factory.
+   * This is needed because the default OrderComparator doesn't know about the bean factory and
+   * therefore can't look up annotations on beans.
+   */
   private static Comparator<Object> beanFactoryAwareOrderComparator(
       ListableBeanFactory beanFactory) {
     return OrderComparator.INSTANCE.withSourceProvider(
@@ -134,25 +140,22 @@ static <T> List<TemporalOptionsCustomizer<T>> chooseTemporalCustomizerBeans(
       return null;
     }
     List<NonRootNamespaceProperties> nonRootNamespaceProperties = properties.getNamespaces();
-    // If we only have one namespace (the root one), use all customizers
-    if (Objects.isNull(nonRootNamespaceProperties) || nonRootNamespaceProperties.isEmpty()) {
-      return customizerMap.entrySet().stream()
-          .sorted(beanFactoryAwareOrderComparator(beanFactory))
-          .map(Entry::getValue)
-          .collect(Collectors.toList());
+    Stream<Entry<String, TemporalOptionsCustomizer<T>>> customizerStream =
+        customizerMap.entrySet().stream();
+    if (!(Objects.isNull(nonRootNamespaceProperties) || nonRootNamespaceProperties.isEmpty())) {
+      // Non-root namespace bean names, such as "nsWorkerFactoryCustomizer", "nsWorkerCustomizer"
+      List<String> nonRootBeanNames =
+          nonRootNamespaceProperties.stream()
+              .map(
+                  ns ->
+                      temporalCustomizerBeanName(
+                          MoreObjects.firstNonNull(ns.getAlias(), ns.getNamespace()),
+                          genericOptionsBuilderClass))
+              .collect(Collectors.toList());
+      customizerStream =
+          customizerStream.filter(entry -> !nonRootBeanNames.contains(entry.getKey()));
     }
-    // Non-root namespace bean names, such as "nsWorkerFactoryCustomizer", "nsWorkerCustomizer"
-    List<String> nonRootBeanNames =
-        nonRootNamespaceProperties.stream()
-            .map(
-                ns ->
-                    temporalCustomizerBeanName(
-                        MoreObjects.firstNonNull(ns.getAlias(), ns.getNamespace()),
-                        genericOptionsBuilderClass))
-            .collect(Collectors.toList());
-
-    return customizerMap.entrySet().stream()
-        .filter(entry -> !nonRootBeanNames.contains(entry.getKey()))
+    return customizerStream
         .sorted(beanFactoryAwareOrderComparator(beanFactory))
         .map(Entry::getValue)
         .collect(Collectors.toList());

temporal-spring-boot-autoconfigure/src/main/java/io/temporal/spring/boot/autoconfigure/NonRootBeanPostProcessor.java

@@ -26,6 +26,7 @@
 import io.temporal.worker.WorkflowImplementationOptions;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
@@ -93,6 +94,16 @@ private void injectBeanByNonRootNamespace(NonRootNamespaceProperties ns) {
         findBeanByNameSpaceForTemporalCustomizer(beanPrefix, WorkerOptions.Builder.class);
     List<TemporalOptionsCustomizer<WorkflowClientOptions.Builder>> workflowClientCustomizers =
         findBeanByNameSpaceForTemporalCustomizer(beanPrefix, WorkflowClientOptions.Builder.class);
+    if (workflowClientCustomizers != null) {
+      workflowClientCustomizers =
+              workflowClientCustomizers.stream()
+                      .map(
+                              c ->
+                                      (TemporalOptionsCustomizer<WorkflowClientOptions.Builder>)
+                                              (WorkflowClientOptions.Builder o) ->
+                                                      c.customize(o).setNamespace(ns.getNamespace()))
+                      .collect(Collectors.toList());
+    }
     List<TemporalOptionsCustomizer<ScheduleClientOptions.Builder>> scheduleClientCustomizers =
         findBeanByNameSpaceForTemporalCustomizer(beanPrefix, ScheduleClientOptions.Builder.class);
     List<TemporalOptionsCustomizer<WorkflowImplementationOptions.Builder>>
@@ -189,6 +200,8 @@ private <T> List<TemporalOptionsCustomizer<T>> findBeanByNameSpaceForTemporalCus
     String beanName =
         AutoConfigurationUtils.temporalCustomizerBeanName(beanPrefix, genericOptionsBuilderClass);
     try {
+      // TODO(https://github.com/temporalio/sdk-java/issues/2638): Support multiple customizers in
+      // the non root namespace
       TemporalOptionsCustomizer<T> genericOptionsCustomizer =
           beanFactory.getBean(beanName, TemporalOptionsCustomizer.class);
       return Collections.singletonList(genericOptionsCustomizer);