chore: support KubernetesInformers annotation on bean constructor

Author: yue9944882

spring/src/main/java/io/kubernetes/client/spring/extended/controller/KubernetesInformerFactoryProcessor.java

@@ -21,8 +21,11 @@
 import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer;
 import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformers;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -41,16 +44,17 @@
  * injects informers to spring context with the underlying constructing process hidden from users.
  */
 public class KubernetesInformerFactoryProcessor
-    implements BeanDefinitionRegistryPostProcessor, Ordered {
+        implements BeanDefinitionRegistryPostProcessor, BeanFactoryAware, Ordered {
+
+  private static final Logger log = LoggerFactory.getLogger(KubernetesInformerFactoryProcessor.class);
 
   public static final int ORDER = 0;
 
   private ConfigurableListableBeanFactory beanFactory;
 
   @Override
   public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
-      throws BeansException {
-    this.beanFactory = beanFactory;
+          throws BeansException {
   }
 
   @Override
@@ -65,15 +69,22 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
       return;
     }
     for (String name : registry.getBeanDefinitionNames()) {
+      KubernetesInformers kubernetesInformers = null;
       Class<?> cls = ((BeanFactory) registry).getType(name);
       if (cls != null) {
-        KubernetesInformers kubernetesInformers =
-            AnnotatedElementUtils.getMergedAnnotation(cls, KubernetesInformers.class);
-        if (kubernetesInformers != null && kubernetesInformers.value().length > 0) {
-          for (KubernetesInformer kubernetesInformer : kubernetesInformers.value()) {
-            registerInformer(registry, kubernetesInformer);
-            registerLister(registry, kubernetesInformer);
-          }
+        kubernetesInformers =
+                AnnotatedElementUtils.getMergedAnnotation(cls, KubernetesInformers.class);
+      }
+      if (kubernetesInformers == null) {
+        kubernetesInformers = beanFactory.findAnnotationOnBean(name, KubernetesInformers.class);
+      }
+      if (kubernetesInformers == null) {
+        continue;
+      }
+      if (kubernetesInformers.value().length > 0) {
+        for (KubernetesInformer kubernetesInformer : kubernetesInformers.value()) {
+          registerInformer(registry, kubernetesInformer);
+          registerLister(registry, kubernetesInformer);
         }
       }
     }
@@ -127,14 +138,19 @@ private <T extends KubernetesObject> SharedInformer<T> informer(
     final GenericKubernetesApi api =
         new GenericKubernetesApi(
             kubernetesInformer.apiTypeClass(),
-            kubernetesInformer.apiListTypeClass(),
-            kubernetesInformer.groupVersionResource().apiGroup(),
-            kubernetesInformer.groupVersionResource().apiVersion(),
-            kubernetesInformer.groupVersionResource().resourcePlural(),
-            apiClient);
+                kubernetesInformer.apiListTypeClass(),
+                kubernetesInformer.groupVersionResource().apiGroup(),
+                kubernetesInformer.groupVersionResource().apiVersion(),
+                kubernetesInformer.groupVersionResource().resourcePlural(),
+                apiClient);
     SharedIndexInformer<T> sharedIndexInformer =
-        sharedInformerFactory.sharedIndexInformerFor(
-            api, type, kubernetesInformer.resyncPeriodMillis(), kubernetesInformer.namespace());
+            sharedInformerFactory.sharedIndexInformerFor(
+                    api, type, kubernetesInformer.resyncPeriodMillis(), kubernetesInformer.namespace());
     return sharedIndexInformer;
   }
+
+  @Override
+  public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+    this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
+  }
 }

spring/src/main/java/io/kubernetes/client/spring/extended/controller/annotation/KubernetesInformers.java

@@ -26,7 +26,7 @@
  * io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer} onto one bean
  * method.
  */
-@Target({ElementType.TYPE})
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface KubernetesInformers {
 

spring/src/test/java/io/kubernetes/client/spring/extended/controller/KubernetesInformerCreatorTest.java

@@ -66,27 +66,25 @@ public ApiClient testingApiClient() {
     }
 
     @Bean
-    public TestSharedInformerFactory testSharedInformerFactory() {
-      return new TestSharedInformerFactory();
-    }
-
     @KubernetesInformers({
-      @KubernetesInformer(
-          apiTypeClass = V1Pod.class,
-          apiListTypeClass = V1PodList.class,
-          groupVersionResource =
-              @GroupVersionResource(apiGroup = "", apiVersion = "v1", resourcePlural = "pods")),
-      @KubernetesInformer(
-          apiTypeClass = V1ConfigMap.class,
-          apiListTypeClass = V1ConfigMapList.class,
-          namespace = "default",
-          groupVersionResource =
-              @GroupVersionResource(
-                  apiGroup = "",
-                  apiVersion = "v1",
-                  resourcePlural = "configmaps")),
+            @KubernetesInformer(
+                    apiTypeClass = V1Pod.class,
+                    apiListTypeClass = V1PodList.class,
+                    groupVersionResource =
+                    @GroupVersionResource(apiGroup = "", apiVersion = "v1", resourcePlural = "pods")),
+            @KubernetesInformer(
+                    apiTypeClass = V1ConfigMap.class,
+                    apiListTypeClass = V1ConfigMapList.class,
+                    namespace = "default",
+                    groupVersionResource =
+                    @GroupVersionResource(
+                            apiGroup = "",
+                            apiVersion = "v1",
+                            resourcePlural = "configmaps")),
     })
-    static class TestSharedInformerFactory {}
+    public SharedInformerFactory testSharedInformerFactory() {
+      return new SharedInformerFactory();
+    }
   }
 
   @Autowired private SharedInformerFactory informerFactory;