From ca3c36313e07f8d20344e0df9e4755b697d82400 Mon Sep 17 00:00:00 2001 From: shawkins Date: Wed, 28 Apr 2021 14:48:09 -0400 Subject: [PATCH] addressing the sonar issues --- .../client/informers/SharedInformerFactory.java | 4 ++-- .../fabric8/kubernetes/client/informers/cache/Cache.java | 8 ++++---- .../client/mock/DefaultSharedIndexInformerTest.java | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java index 0a4ecff224d..dd08a4b08c7 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java @@ -267,7 +267,7 @@ public synchronized SharedIndexInformer getExistingSharedIndexInformer(Cl SharedIndexInformer foundSharedIndexInformer = null; for (Map.Entry entry : this.informers.entrySet()) { if (isKeyOfType(entry.getKey(), apiTypeClass)) { - foundSharedIndexInformer = entry.getValue(); + foundSharedIndexInformer = (SharedIndexInformer) entry.getValue(); } } return foundSharedIndexInformer; @@ -284,7 +284,7 @@ public synchronized void startAllRegisteredInformers() { if (!informerExecutor.isShutdown()) { informers.forEach( (informerType, informer) -> - startedInformers.computeIfAbsent(informerType, key -> informerExecutor.submit((Runnable)informer::run))); + startedInformers.computeIfAbsent(informerType, key -> informerExecutor.submit(informer::run))); } } diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Cache.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Cache.java index cdda0c42505..9d8cc3f1b53 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Cache.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Cache.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.BooleanSupplier; import java.util.function.Function; -import java.util.function.Supplier; /** * It basically saves and indexes all the entries. @@ -51,7 +51,7 @@ public class Cache implements Indexer { // indices stores objects' key by their indices private Map>> indices = new HashMap<>(); - private Supplier isRunning = () -> false; + private BooleanSupplier isRunning = () -> false; public Cache() { this(NAMESPACE_INDEX, Cache::metaNamespaceIndexFunc, Cache::deletionHandlingMetaNamespaceKeyFunc); @@ -63,7 +63,7 @@ public Cache(String indexName, Function> indexFunc, Function()); } - public void setIsRunning(Supplier isRunning) { + public void setIsRunning(BooleanSupplier isRunning) { this.isRunning = isRunning; } @@ -92,7 +92,7 @@ public Map>> getIndexers() { @Override public void addIndexers(Map>> indexersNew) { - if (isRunning.get()) { + if (isRunning.getAsBoolean()) { throw new IllegalStateException("Cannot add indexers to a running informer."); } if (!items.isEmpty()) { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DefaultSharedIndexInformerTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DefaultSharedIndexInformerTest.java index 23deb335233..b44bd23208d 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DefaultSharedIndexInformerTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DefaultSharedIndexInformerTest.java @@ -847,7 +847,8 @@ public void onDelete(Pod oldObj, boolean deletedFinalStateUnknown) { assertFalse(podInformer.isRunning()); } - @Test public void testRunAfterStop() { + @Test + void testRunAfterStop() { SharedIndexInformer podInformer = factory.sharedIndexInformerFor(Pod.class, 0); podInformer.run(); podInformer.stop();