Merge pull request #1067 from sarveshkaushal/master

k8s-ci-robot · web-flow · commit a912ddabf883 · 2020-07-15T13:54:38.000-07:00
Code clean up.
diff --git a/util/src/main/java/io/kubernetes/client/informer/impl/DefaultSharedIndexInformer.java b/util/src/main/java/io/kubernetes/client/informer/impl/DefaultSharedIndexInformer.java
@@ -253,9 +253,6 @@ private long determineResyncPeriod(long desired, long check) {
     if (check == 0) {
       return 0;
     }
-    if (desired < check) {
-      return check;
-    }
-    return desired;
+    return Math.max(desired, check);
   }
 }
diff --git a/util/src/test/java/io/kubernetes/client/util/YamlTest.java b/util/src/test/java/io/kubernetes/client/util/YamlTest.java
@@ -172,7 +172,7 @@ public void testLoadIntOrString() {
       assertTrue(
           "Target port for 'intPort' was parsed to a string, integer expected.",
           intPort.getTargetPort().isInteger());
-      assertEquals(1l, (long) intPort.getTargetPort().getIntValue());
+      assertEquals(1L, (long) intPort.getTargetPort().getIntValue());
     } catch (Exception ex) {
       assertNull("Unexpected exception: " + ex.toString(), ex);
     }

Original file line number	Diff line number	Diff line change
`@@ -253,9 +253,6 @@ private long determineResyncPeriod(long desired, long check) {`
`253`	`253`	`if (check == 0) {`
`254`	`254`	`return 0;`
`255`	`255`	`}`
`256`		`- if (desired < check) {`
`257`		`- return check;`
`258`		`- }`
`259`		`- return desired;`
	`256`	`+ return Math.max(desired, check);`
`260`	`257`	`}`
`261`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public void testLoadIntOrString() {`
`172`	`172`	`assertTrue(`
`173`	`173`	`"Target port for 'intPort' was parsed to a string, integer expected.",`
`174`	`174`	`intPort.getTargetPort().isInteger());`
`175`		`- assertEquals(1l, (long) intPort.getTargetPort().getIntValue());`
	`175`	`+ assertEquals(1L, (long) intPort.getTargetPort().getIntValue());`
`176`	`176`	`} catch (Exception ex) {`
`177`	`177`	`assertNull("Unexpected exception: " + ex.toString(), ex);`
`178`	`178`	`}`