fix e2e and windows

Signed-off-by: Adrian Cole <[email protected]>

Author: codefromthecrypt

e2e/src/test/java/io/kubernetes/client/e2e/extended/leaderelection/LeaderElectorTest.java

@@ -25,7 +25,6 @@
 import io.kubernetes.client.openapi.apis.CoordinationV1Api;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.util.ClientBuilder;
-import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -37,7 +36,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -70,17 +68,8 @@ public static Collection<Object[]> constructorFeeder() {
   private ApiClient apiClient;
   private LockType lockType;
 
-  public void initLeaderElectorTest(LockType lockType) {
-    try {
-      apiClient = ClientBuilder.defaultClient();
-    } catch (IOException ex) {
-      throw new RuntimeException("Couldn't create ApiClient", ex);
-    }
-    this.lockType = lockType;
-  }
-
-  @BeforeEach
-  void setup() throws Exception {
+  private void initLeaderElectorTest(LockType lockType) throws Exception {
+    apiClient = ClientBuilder.defaultClient();
     // delete the lock resource if it exists, or else first leader candidate might need to wait for
     // a whole leaseDuration configured
     switch (lockType) {
@@ -96,6 +85,7 @@ void setup() throws Exception {
       default:
         throw new RuntimeException("Unknown LockType " + lockType);
     }
+    this.lockType = lockType;
   }
 
   @MethodSource("constructorFeeder")
@@ -110,8 +100,8 @@ void singleCandidateLeaderElection(LockType lockType) throws Exception {
         makeAndRunLeaderElectorAsync(
             "candidate",
             null,
-            () -> startLeadershipLatch.countDown(),
-            () -> stopLeadershipLatch.countDown(),
+            startLeadershipLatch::countDown,
+            stopLeadershipLatch::countDown,
             apiClient);
 
     startLeadershipLatch.await();
@@ -203,8 +193,8 @@ void leaderGracefulShutdown(LockType lockType) throws Exception {
         makeAndRunLeaderElectorAsync(
             "candidate1",
             null,
-            () -> startBeingLeader1.countDown(),
-            () -> stopBeingLeader1.countDown(),
+            startBeingLeader1::countDown,
+            stopBeingLeader1::countDown,
             apiClient);
 
     // wait for candidate1 to become leader
@@ -217,8 +207,8 @@ void leaderGracefulShutdown(LockType lockType) throws Exception {
         makeAndRunLeaderElectorAsync(
             "candidate2",
             null,
-            () -> startBeingLeader2.countDown(),
-            () -> stopBeingLeader2.countDown(),
+            startBeingLeader2::countDown,
+            stopBeingLeader2::countDown,
             apiClient);
 
     leaderElector1.close();

util/src/test/java/io/kubernetes/client/util/FilePersisterTest.java

@@ -14,12 +14,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.kubernetes.client.Resources;
+import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
+import io.kubernetes.client.Resources;
 import io.kubernetes.client.persister.FilePersister;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -30,23 +32,27 @@ class FilePersisterTest {
 
   @Test
   void persistence(@TempDir Path tempDir) throws IOException {
-    Path file = Files.createTempFile(tempDir, "testconfig", null);
-    FilePersister fp = new FilePersister(file.toString());
+    File file = Files.createTempFile(tempDir, "testconfig", null).toFile();
 
-    KubeConfig config = KubeConfig.loadKubeConfig(new FileReader(KUBECONFIG_FILE_PATH));
+    KubeConfig config;
+    try (Reader reader = new FileReader(KUBECONFIG_FILE_PATH)) {
+      config = KubeConfig.loadKubeConfig(reader);
+    }
 
+    FilePersister fp = new FilePersister(file);
     fp.save(
         config.getContexts(),
         config.getClusters(),
         config.getUsers(),
         config.getPreferences(),
         config.getCurrentContext());
 
-    KubeConfig configOut = KubeConfig.loadKubeConfig(new FileReader(file.toFile()));
-
-    assertThat(configOut.getCurrentContext()).isEqualTo(config.getCurrentContext());
-    assertThat(configOut.getClusters()).isEqualTo(config.getClusters());
-    assertThat(configOut.getContexts()).isEqualTo(config.getContexts());
-    assertThat(configOut.getUsers()).isEqualTo(config.getUsers());
+    try (Reader reader = new FileReader(file)) {
+      KubeConfig configOut = KubeConfig.loadKubeConfig(reader);
+      assertThat(configOut.getCurrentContext()).isEqualTo(config.getCurrentContext());
+      assertThat(configOut.getClusters()).isEqualTo(config.getClusters());
+      assertThat(configOut.getContexts()).isEqualTo(config.getContexts());
+      assertThat(configOut.getUsers()).isEqualTo(config.getUsers());
+    }
   }
 }

util/src/test/java/io/kubernetes/client/util/KubeConfigTest.java

@@ -22,6 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -99,8 +100,10 @@ void gcpAuthProvider(@TempDir Path tempDir) throws Exception {
     Path config = Files.createTempFile(tempDir, "config", null);
     Files.writeString(config, GCP_CONFIG);
 
-    KubeConfig kc = KubeConfig.loadKubeConfig(new FileReader(config.toFile()));
-    assertThat(kc.getCredentials()).containsEntry(KubeConfig.CRED_TOKEN_KEY, "fake-token");
+    try (Reader reader = new FileReader(config.toFile())) {
+      KubeConfig kc = KubeConfig.loadKubeConfig(reader);
+      assertThat(kc.getCredentials()).containsEntry(KubeConfig.CRED_TOKEN_KEY, "fake-token");
+    }
   }
 
   private static String GCP_TEST_DATE_STRING =
@@ -130,8 +133,10 @@ void gcpAuthProviderStringDate(@TempDir Path tempDir) throws IOException {
     Path config = Files.createTempFile(tempDir, "config", null);
     Files.writeString(config, GCP_TEST_DATE_STRING);
 
-    KubeConfig kc = KubeConfig.loadKubeConfig(new FileReader(config.toFile()));
-    assertThat(kc.getCredentials()).containsEntry(KubeConfig.CRED_TOKEN_KEY, "fake-token");
+    try (Reader reader = new FileReader(config.toFile())) {
+      KubeConfig kc = KubeConfig.loadKubeConfig(reader);
+      assertThat(kc.getCredentials()).containsEntry(KubeConfig.CRED_TOKEN_KEY, "fake-token");
+    }
   }
 
   @Test