Merge pull request #1727 from yue9944882/bugfix/duplicate-resync

Fixes duplicated SharedProcessor#shouldResync calls

Author: k8s-ci-robot

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

@@ -36,7 +36,7 @@ public ResyncRunnable(DeltaFIFO store, Supplier<Boolean> shouldResyncFunc) {
   public void run() {
     log.debug("ResyncRunnable#resync ticker tick");
 
-    if (shouldResyncFunc == null || (shouldResyncFunc.get() != null && shouldResyncFunc.get())) {
+    if (shouldResyncFunc == null || Boolean.TRUE.equals(shouldResyncFunc.get())) {
       log.debug("ResyncRunnable#force resync");
       this.store.resync();
     }

util/src/test/java/io/kubernetes/client/informer/ResyncRunnableTest.java

@@ -13,8 +13,10 @@
 package io.kubernetes.client.informer;
 
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import io.kubernetes.client.informer.cache.DeltaFIFO;
+import java.util.function.Supplier;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -27,32 +29,42 @@ public class ResyncRunnableTest {
 
   @Mock private DeltaFIFO deltaFIFO;
 
+  @Mock private Supplier<Boolean> shouldResync;
+
   @Test
   public void testNullSupplier() {
-    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, null);
+    when(shouldResync.get()).thenReturn(true);
+    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, shouldResync);
     underTest.run();
     verify(deltaFIFO, Mockito.times(1)).resync();
+    verify(shouldResync, Mockito.times(1)).get();
   }
 
   @Test
   public void testSupplierReturnsFalse() {
-    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, () -> false);
+    when(shouldResync.get()).thenReturn(false);
+    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, shouldResync);
     underTest.run();
     verify(deltaFIFO, Mockito.never()).resync();
+    verify(shouldResync, Mockito.times(1)).get();
   }
 
   @Test
   public void testSupplierReturnsTrue() {
-    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, () -> true);
+    when(shouldResync.get()).thenReturn(true);
+    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, shouldResync);
     underTest.run();
     verify(deltaFIFO, Mockito.times(1)).resync();
+    verify(shouldResync, Mockito.times(1)).get();
   }
 
   // "() -> null" is going to be treated as false
   @Test
   public void testSupplierReturnsNull() {
-    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, () -> null);
+    when(shouldResync.get()).thenReturn(null);
+    ResyncRunnable underTest = new ResyncRunnable(deltaFIFO, shouldResync);
     underTest.run();
     verify(deltaFIFO, Mockito.never()).resync();
+    verify(shouldResync, Mockito.times(1)).get();
   }
 }