fixes broken pom and re-run formatter

Author: yue9944882

extended/pom.xml

@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
-            <artifactId>system-rules</artifactId>
+            <artifactId>system-lambda</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

util/src/test/java/io/kubernetes/client/informer/cache/CacheTest.java

@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

util/src/test/java/io/kubernetes/client/informer/cache/ControllerTest.java

@@ -24,7 +24,6 @@
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Rule;
 import org.junit.Test;
 
 public class ControllerTest {

util/src/test/java/io/kubernetes/client/informer/cache/DeltaFIFOTest.java

@@ -23,7 +23,6 @@
 import java.util.Deque;
 import java.util.LinkedList;
 import org.apache.commons.lang3.tuple.MutablePair;
-import org.junit.Rule;
 import org.junit.Test;
 
 public class DeltaFIFOTest {

util/src/test/java/io/kubernetes/client/informer/cache/ListerTest.java

@@ -18,7 +18,6 @@
 import io.kubernetes.client.openapi.models.V1Pod;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Rule;
 import org.junit.Test;
 
 public class ListerTest {

util/src/test/java/io/kubernetes/client/informer/cache/ProcessorListenerTest.java

@@ -17,7 +17,6 @@
 import io.kubernetes.client.informer.ResourceEventHandler;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Pod;
-import org.junit.Rule;
 import org.junit.Test;
 
 public class ProcessorListenerTest {

util/src/test/java/io/kubernetes/client/informer/cache/ReflectorRunnableTest.java

@@ -34,7 +34,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.awaitility.Awaitility;
 import org.hamcrest.core.IsEqual;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;

util/src/test/java/io/kubernetes/client/informer/cache/SharedProcessorTest.java

@@ -20,7 +20,6 @@
 import io.kubernetes.client.openapi.models.V1Pod;
 import java.time.Duration;
 import java.util.concurrent.Executors;
-import org.junit.Rule;
 import org.junit.Test;
 
 public class SharedProcessorTest {

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

@@ -12,6 +12,7 @@
 */
 package io.kubernetes.client.util;
 
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 import static io.kubernetes.client.util.Config.ENV_SERVICE_HOST;
 import static io.kubernetes.client.util.Config.ENV_SERVICE_PORT;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -30,11 +31,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
-import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 
 /** Tests for the ConfigBuilder helper class */
 public class ClientBuilderTest {
@@ -60,115 +57,127 @@ public class ClientBuilderTest {
   public static final String KUBEDIR = ".kube";
   public static final String KUBECONFIG = "config";
 
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
-  @Before
-  public void setup() {
-    environmentVariables.set("HOME", "/non-existent");
-    environmentVariables.set("KUBECONFIG", null);
-  }
-
   @Test
   public void testDefaultClientWithNoFiles() throws Exception {
-     String path = withEnvironmentVariable("HOME", "/non-existent")
-        .execute(() -> {
-          environmentVariables.set("HOME", "/non-existent");
-          final ApiClient client = ClientBuilder.defaultClient();
-          return client.getBasePath();
-        });
+    String path =
+        withEnvironmentVariable("HOME", "/non-existent")
+            .and("KUBECONFIG", null)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.defaultClient();
+                  return client.getBasePath();
+                });
     assertEquals("http://localhost:8080", path);
   }
 
   @Test
   public void testDefaultClientReadsHomeDir() throws Exception {
-    String path = withEnvironmentVariable("HOME", HOME_PATH)
-        .execute(() -> {
-          ApiClient client = ClientBuilder.defaultClient();
-          return client.getBasePath();
-        });
+    String path =
+        withEnvironmentVariable("HOME", HOME_PATH)
+            .execute(
+                () -> {
+                  ApiClient client = ClientBuilder.defaultClient();
+                  return client.getBasePath();
+                });
     assertEquals("http://home.dir.com", path);
   }
 
   @Test
   public void testDefaultClientReadsKubeConfig() throws Exception {
-    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_FILE_PATH)
-        .execute(() -> {
-          final ApiClient client = ClientBuilder.defaultClient();
-          return client.getBasePath();
-        });
+    String path =
+        withEnvironmentVariable("KUBECONFIG", KUBECONFIG_FILE_PATH)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.defaultClient();
+                  return client.getBasePath();
+                });
     assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testDefaultClientUTF8EncodedConfig() throws Exception {
-    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_UTF8_FILE_PATH)
-        .execute(() -> {
-          final ApiClient client = ClientBuilder.defaultClient();
-          return client.getBasePath();
-        });
+    String path =
+        withEnvironmentVariable("KUBECONFIG", KUBECONFIG_UTF8_FILE_PATH)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.defaultClient();
+                  return client.getBasePath();
+                });
     assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testDefaultClientReadsKubeConfigMultiple() throws Exception {
     final String kubeConfigEnv = KUBECONFIG_FILE_PATH + File.pathSeparator + "/non-existent";
-    String path = withEnvironmentVariable("KUBECONFIG", kubeConfigEnv)
-        .execute(() -> {
-          final ApiClient client = ClientBuilder.defaultClient();
-          return client.getBasePath();
-        });
+    String path =
+        withEnvironmentVariable("KUBECONFIG", kubeConfigEnv)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.defaultClient();
+                  return client.getBasePath();
+                });
     assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testKubeconfigPreferredOverHomeDir() throws Exception {
-    String path = withEnvironmentVariable("HOME", HOME_PATH)
-      .and("KUBECONFIG", KUBECONFIG_FILE_PATH)
-      .execute(() -> {
-        final ApiClient client = ClientBuilder.standard().build();
-        return client.getBasePath();
-      });
+    String path =
+        withEnvironmentVariable("HOME", HOME_PATH)
+            .and("KUBECONFIG", KUBECONFIG_FILE_PATH)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.standard().build();
+                  return client.getBasePath();
+                });
     // $KUBECONFIG should take precedence over $HOME/.kube/config
     assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testInvalidKubeconfig() throws Exception {
-    String path = withEnvironmentVariable("KUBECONFIG", "/non-existent")
-      .execute(() -> {
-        final ApiClient client = ClientBuilder.standard().build();
-        return client.getBasePath();
-      });
+    String path =
+        withEnvironmentVariable("KUBECONFIG", "/non-existent")
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.standard().build();
+                  return client.getBasePath();
+                });
     assertThat(path, is(Config.DEFAULT_FALLBACK_HOST));
   }
 
   @Test
   public void testKubeconfigAddsSchemeHttps() throws Exception {
-    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTPS_FILE_PATH)
-      .execute(() -> {
-        final ApiClient client = ClientBuilder.standard().build();
-        return client.getBasePath();
-      });
+    String path =
+        withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTPS_FILE_PATH)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.standard().build();
+                  return client.getBasePath();
+                });
     assertThat(path, is("https://localhost:443"));
   }
 
   @Test
   public void testKubeconfigAddsSchemeHttp() throws Exception {
-    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH)
-      .execute(() -> {
-        final ApiClient client = ClientBuilder.standard().build();
-        return client.getBasePath();
-      });
+    String path =
+        withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.standard().build();
+                  return client.getBasePath();
+                });
     assertThat(path, is("http://localhost"));
   }
 
   @Test
   public void testKubeconfigDisablesVerifySsl() throws Exception {
-    boolean isVerifyingSsl = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH)
-      .execute(() -> {
-        final ApiClient client = ClientBuilder.standard().build();
-        return client.isVerifyingSsl();
-      });
+    boolean isVerifyingSsl =
+        withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.standard().build();
+                  return client.isVerifyingSsl();
+                });
     assertThat(isVerifyingSsl, is(false));
   }
 
@@ -180,11 +189,13 @@ public void testBasePathTrailingSlash() throws Exception {
 
   @Test
   public void testStandardVerifiesSsl() throws Exception {
-    boolean isVerifyingSsl = withEnvironmentVariable("HOME", "/non-existent")
-      .execute(() -> {
-        final ApiClient client = ClientBuilder.standard().build();
-        return client.isVerifyingSsl();
-      });
+    boolean isVerifyingSsl =
+        withEnvironmentVariable("HOME", "/non-existent")
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.standard().build();
+                  return client.isVerifyingSsl();
+                });
     assertThat(isVerifyingSsl, is(true));
   }
 
@@ -218,51 +229,57 @@ public void testSslCertCaBad() throws Exception {
 
   @Test
   public void testHomeDirPreferredOverKubeConfig() throws Exception {
-    String path = withEnvironmentVariable("HOME", HOME_PATH)
-      .and("KUBEDIR", KUBEDIR)
-      .and("KUBECONFIG", KUBECONFIG)
-      .execute(() -> {
-        final ApiClient client = ClientBuilder.standard().build();
-        return client.getBasePath();
-      });
+    String path =
+        withEnvironmentVariable("HOME", HOME_PATH)
+            .and("KUBEDIR", KUBEDIR)
+            .and("KUBECONFIG", KUBECONFIG)
+            .execute(
+                () -> {
+                  final ApiClient client = ClientBuilder.standard().build();
+                  return client.getBasePath();
+                });
     assertEquals(path, "http://home.dir.com");
   }
 
   @Test
   public void testIPv4AddressParsingShouldWork() throws Exception {
-    String path = withEnvironmentVariable(ENV_SERVICE_HOST, "127.0.0.1")
-      .and(ENV_SERVICE_PORT, "6443")
-      .execute(() -> {
-        String ipv4Host = "127.0.0.1";
-        String port = "6443";
-        ClientBuilder builder =
-          new ClientBuilder() {
-            @Override
-            public ClientBuilder setBasePath(String host, String port) {
-              return super.setBasePath(host, port);
-            }
-          }.setBasePath(ipv4Host, port);
-        return builder.getBasePath();
-      });
+    String path =
+        withEnvironmentVariable(ENV_SERVICE_HOST, "127.0.0.1")
+            .and(ENV_SERVICE_PORT, "6443")
+            .execute(
+                () -> {
+                  String ipv4Host = "127.0.0.1";
+                  String port = "6443";
+                  ClientBuilder builder =
+                      new ClientBuilder() {
+                        @Override
+                        public ClientBuilder setBasePath(String host, String port) {
+                          return super.setBasePath(host, port);
+                        }
+                      }.setBasePath(ipv4Host, port);
+                  return builder.getBasePath();
+                });
     assertEquals(path, "https://127.0.0.1:6443");
   }
 
   @Test
   public void testIPv6AddressParsingShouldWork() throws Exception {
-    String path = withEnvironmentVariable(ENV_SERVICE_HOST, "127.0.0.1")
-      .and(ENV_SERVICE_PORT, "6443")
-      .execute(() -> {
-        String ipv4Host = "::1";
-        String port = "6443";
-        ClientBuilder builder =
-          new ClientBuilder() {
-            @Override
-            public ClientBuilder setBasePath(String host, String port) {
-              return super.setBasePath(host, port);
-            }
-          }.setBasePath(ipv4Host, port);
-          return builder.getBasePath();
-      });
+    String path =
+        withEnvironmentVariable(ENV_SERVICE_HOST, "127.0.0.1")
+            .and(ENV_SERVICE_PORT, "6443")
+            .execute(
+                () -> {
+                  String ipv4Host = "::1";
+                  String port = "6443";
+                  ClientBuilder builder =
+                      new ClientBuilder() {
+                        @Override
+                        public ClientBuilder setBasePath(String host, String port) {
+                          return super.setBasePath(host, port);
+                        }
+                      }.setBasePath(ipv4Host, port);
+                  return builder.getBasePath();
+                });
     assertEquals(path, "https://[::1]:6443");
   }