Merge pull request kubernetes-client#819 from ahadas/refactoring

k8s-ci-robot · web-flow · commit 69ca6fd7cca4 · 2019-12-02T16:06:57.000-08:00
Minor cleanup in SharedInformerFactory
diff --git a/util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java b/util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java
@@ -171,11 +171,9 @@ public synchronized void startAllRegisteredInformers() {
       return;
     }
     informers.forEach(
-        (informerType, informer) -> {
-          if (!startedInformers.containsKey(informerType)) {
-            startedInformers.put(informerType, informerExecutor.submit(informer::run));
-          }
-        });
+        (informerType, informer) ->
+            startedInformers.computeIfAbsent(
+                informerType, key -> informerExecutor.submit(informer::run)));
   }
 
   /** Stop all registered informers and shut down the thread pool. */
@@ -194,8 +192,7 @@ public synchronized void stopAllRegisteredInformers(boolean shutdownThreadPool)
     }
     informers.forEach(
         (informerType, informer) -> {
-          if (startedInformers.containsKey(informerType)) {
-            startedInformers.remove(informerType);
+          if (startedInformers.remove(informerType) != null) {
             informer.stop();
           }
         });

Original file line number	Diff line number	Diff line change
`@@ -171,11 +171,9 @@ public synchronized void startAllRegisteredInformers() {`
`171`	`171`	`return;`
`172`	`172`	`}`
`173`	`173`	`informers.forEach(`
`174`		`- (informerType, informer) -> {`
`175`		`- if (!startedInformers.containsKey(informerType)) {`
`176`		`- startedInformers.put(informerType, informerExecutor.submit(informer::run));`
`177`		`- }`
`178`		`- });`
	`174`	`+ (informerType, informer) ->`
	`175`	`+ startedInformers.computeIfAbsent(`
	`176`	`+ informerType, key -> informerExecutor.submit(informer::run)));`
`179`	`177`	`}`
`180`	`178`
`181`	`179`	`/** Stop all registered informers and shut down the thread pool. */`
`@@ -194,8 +192,7 @@ public synchronized void stopAllRegisteredInformers(boolean shutdownThreadPool)`
`194`	`192`	`}`
`195`	`193`	`informers.forEach(`
`196`	`194`	`(informerType, informer) -> {`
`197`		`- if (startedInformers.containsKey(informerType)) {`
`198`		`- startedInformers.remove(informerType);`
	`195`	`+ if (startedInformers.remove(informerType) != null) {`
`199`	`196`	`informer.stop();`
`200`	`197`	`}`
`201`	`198`	`});`