simplify informer/lister interface

Author: yue9944882

util/src/main/java/io/kubernetes/client/informer/ClusterScopeInformer.java

@@ -1,5 +1,5 @@
 package io.kubernetes.client.informer;
 
 public interface ClusterScopeInformer<T> extends BasicInformer<T> {
-  ClusterScopeLister<T> lister();
+  Lister<T> lister();
 }

util/src/main/java/io/kubernetes/client/informer/ClusterScopeLister.java

@@ -7,8 +7,4 @@ public interface Lister<T> {
   List<T> list();
 
   T get(String name);
-
-  List<T> list(String namespace);
-
-  T get(String namespace, String name);
 }

util/src/main/java/io/kubernetes/client/informer/Lister.java

@@ -1,5 +1,5 @@
 package io.kubernetes.client.informer;
 
 public interface NamespacedInformer<T> extends BasicInformer<T> {
-  NamespacedLister<T> lister();
+  Lister<T> lister(String namespace);
 }

util/src/main/java/io/kubernetes/client/informer/NamespacedInformer.java

@@ -4,8 +4,7 @@
 import com.squareup.okhttp.Call;
 import io.kubernetes.client.*;
 import io.kubernetes.client.informer.exception.BuildInformerException;
-import io.kubernetes.client.informer.impl.DefaultClusterScopedInformer;
-import io.kubernetes.client.informer.impl.DefaultNamespacedInformer;
+import io.kubernetes.client.informer.impl.DefaultInfomer;
 import io.kubernetes.client.informer.impl.DefaultSharedIndexInformer;
 import io.kubernetes.client.util.Watch;
 import io.swagger.annotations.ApiParam;
@@ -22,7 +21,7 @@
 
 public class SharedInformerFactory {
 
-  private Map<Class, BasicInformer> informers;
+  private Map<Class, DefaultInfomer> informers;
   private Map<Class, Boolean> startedInformers;
   private ExecutorService informerExecutor;
 
@@ -63,12 +62,12 @@ public <T> ClusterScopeInformer<T> informerForClusterScopeResource(
   public <T> ClusterScopeInformer<T> informerForClusterScopeResource(
       Class clientClass, Class<T> resourceClass, long resyncPeriod) throws BuildInformerException {
     if (this.informers.containsKey(resourceClass)) {
-      return (ClusterScopeInformer<T>) this.informers.get(resourceClass);
+      return this.informers.get(resourceClass);
     }
     ListerWatcher<T> listerWatcher = listWatcherFor(clientClass, resourceClass, false, false);
     DefaultSharedIndexInformer<T> indexInformer =
         new DefaultSharedIndexInformer<>(listerWatcher, resourceClass, resyncPeriod);
-    DefaultClusterScopedInformer<T> informer = new DefaultClusterScopedInformer<>(indexInformer);
+    DefaultInfomer<T> informer = new DefaultInfomer<>(indexInformer);
     this.informers.put(resourceClass, informer);
     return informer;
   }
@@ -103,13 +102,13 @@ public <T> NamespacedInformer<T> informerForNamespacedResource(
       Class clientClass, Class<T> resourceClass, String namespace, long resyncPeriod)
       throws BuildInformerException {
     if (this.informers.containsKey(resourceClass)) {
-      return (NamespacedInformer<T>) this.informers.get(resourceClass);
+      return this.informers.get(resourceClass);
     }
     boolean allnamespace = (namespace == null || namespace.length() == 0);
     ListerWatcher<T> listerWatcher = listWatcherFor(clientClass, resourceClass, true, allnamespace);
     DefaultSharedIndexInformer<T> indexInformer =
         new DefaultSharedIndexInformer<>(listerWatcher, resourceClass, resyncPeriod);
-    NamespacedInformer<T> informer = new DefaultNamespacedInformer<>(indexInformer);
+    DefaultInfomer<T> informer = new DefaultInfomer<>(indexInformer);
     this.informers.put(resourceClass, informer);
     return informer;
   }

util/src/main/java/io/kubernetes/client/informer/NamespacedLister.java

@@ -0,0 +1,29 @@
+package io.kubernetes.client.informer.impl;
+
+import io.kubernetes.client.informer.*;
+
+public class DefaultInfomer<T> implements NamespacedInformer<T>, ClusterScopeInformer<T> {
+
+  private SharedIndexInformer<T> sharedIndexInformer;
+
+  public DefaultInfomer(SharedIndexInformer<T> informer) {
+    this.sharedIndexInformer = informer;
+  }
+
+  // Returns a lister for clusterscope
+  @Override
+  public Lister<T> lister() {
+    return new DefaultLister(sharedIndexInformer.getIndexer(), null);
+  }
+
+  // Returns a lister for namespace
+  @Override
+  public Lister<T> lister(String namespace) {
+    return new DefaultLister(sharedIndexInformer.getIndexer(), namespace);
+  }
+
+  @Override
+  public SharedIndexInformer<T> informer() {
+    return null;
+  }
+}

util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java

@@ -0,0 +1,43 @@
+package io.kubernetes.client.informer.impl;
+
+import io.kubernetes.client.informer.Lister;
+import io.kubernetes.client.informer.cache.Cache;
+import io.kubernetes.client.informer.cache.Indexer;
+import java.util.List;
+
+public class DefaultLister<T> implements Lister<T> {
+
+  private String namespace;
+
+  private String indexName;
+
+  private Indexer<T> indexer;
+
+  DefaultLister(Indexer<T> indexer, String namespace) {
+    this(indexer, Cache.NAMESPACE_INDEX, namespace);
+  }
+
+  DefaultLister(Indexer<T> indexer, String indexName, String namespace) {
+    this.indexer = indexer;
+    this.indexName = indexName;
+    this.namespace = namespace;
+  }
+
+  @Override
+  public List<T> list() {
+    if (namespace == null || namespace.length() == 0) {
+      return indexer.list();
+    } else {
+      return indexer.byIndex(this.indexName, namespace);
+    }
+  }
+
+  @Override
+  public T get(String name) {
+    String key = name;
+    if (!(namespace == null || namespace.length() == 0)) {
+      key = namespace + "/" + name;
+    }
+    return indexer.getByKey(key);
+  }
+}