refactor: change package name (#25)

csviri · web-flow · commit c5d288ed1ca8 · 2023-03-17T10:02:58.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.csviri.jenvtest</groupId>
+    <groupId>io.csviri.jenvtest</groupId>
     <artifactId>jenvtest</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/src/main/java/io/csviri/jenvtest/CertManager.java b/src/main/java/io/csviri/jenvtest/CertManager.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/main/java/io/csviri/jenvtest/JenvtestException.java b/src/main/java/io/csviri/jenvtest/JenvtestException.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 public class JenvtestException extends RuntimeException {
 
diff --git a/src/main/java/io/csviri/jenvtest/KubeAPIServer.java b/src/main/java/io/csviri/jenvtest/KubeAPIServer.java
@@ -1,10 +1,12 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.csviri.jenvtest.binary.BinaryManager;
-import com.csviri.jenvtest.process.*;
+import io.csviri.jenvtest.binary.BinaryManager;
+import io.csviri.jenvtest.process.EtcdProcess;
+import io.csviri.jenvtest.process.KubeAPIServerProcess;
+import io.csviri.jenvtest.process.UnexpectedProcessStopHandler;
 
 public class KubeAPIServer implements UnexpectedProcessStopHandler {
 
diff --git a/src/main/java/io/csviri/jenvtest/KubeAPIServerConfig.java b/src/main/java/io/csviri/jenvtest/KubeAPIServerConfig.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.util.Optional;
 
diff --git a/src/main/java/io/csviri/jenvtest/KubeAPIServerConfigBuilder.java b/src/main/java/io/csviri/jenvtest/KubeAPIServerConfigBuilder.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.io.File;
 
diff --git a/src/main/java/io/csviri/jenvtest/KubeConfig.java b/src/main/java/io/csviri/jenvtest/KubeConfig.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -7,7 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.csviri.jenvtest.binary.BinaryManager;
+import io.csviri.jenvtest.binary.BinaryManager;
 
 public class KubeConfig {
 
diff --git a/src/main/java/io/csviri/jenvtest/Utils.java b/src/main/java/io/csviri/jenvtest/Utils.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.io.InputStream;
 import java.util.Comparator;
@@ -7,7 +7,7 @@
 
 import org.slf4j.Logger;
 
-import com.csviri.jenvtest.binary.OSInfo;
+import io.csviri.jenvtest.binary.OSInfo;
 
 public class Utils {
 
diff --git a/src/main/java/io/csviri/jenvtest/binary/Binaries.java b/src/main/java/io/csviri/jenvtest/binary/Binaries.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.binary;
+package io.csviri.jenvtest.binary;
 
 import java.io.File;
 
diff --git a/src/main/java/io/csviri/jenvtest/binary/BinaryDownloader.java b/src/main/java/io/csviri/jenvtest/binary/BinaryDownloader.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.binary;
+package io.csviri.jenvtest.binary;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -13,8 +13,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.csviri.jenvtest.JenvtestException;
-import com.csviri.jenvtest.Utils;
+import io.csviri.jenvtest.JenvtestException;
+import io.csviri.jenvtest.Utils;
 
 public class BinaryDownloader {
 
diff --git a/src/main/java/io/csviri/jenvtest/binary/BinaryManager.java b/src/main/java/io/csviri/jenvtest/binary/BinaryManager.java
@@ -1,15 +1,13 @@
-package com.csviri.jenvtest.binary;
+package io.csviri.jenvtest.binary;
 
 import java.io.File;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.csviri.jenvtest.JenvtestException;
-import com.csviri.jenvtest.KubeAPIServerConfig;
-import com.csviri.jenvtest.Utils;
-
-import static com.csviri.jenvtest.binary.Binaries.*;
+import io.csviri.jenvtest.JenvtestException;
+import io.csviri.jenvtest.KubeAPIServerConfig;
+import io.csviri.jenvtest.Utils;
 
 public class BinaryManager {
 
@@ -41,9 +39,9 @@ public void initAndDownloadIfRequired() {
   }
 
   private void initBinariesPojo(File binaryDir) {
-    this.binaries = new Binaries(new File(binaryDir, ETCD_BINARY_NAME),
-        new File(binaryDir, API_SERVER_BINARY_NAME),
-        new File(binaryDir, KUBECTL_BINARY_NAME));
+    this.binaries = new Binaries(new File(binaryDir, Binaries.ETCD_BINARY_NAME),
+        new File(binaryDir, Binaries.API_SERVER_BINARY_NAME),
+        new File(binaryDir, Binaries.KUBECTL_BINARY_NAME));
     if (!binaries.getApiServer().exists()) {
       throw new JenvtestException(
           "API Server binary not found at path:" + binaries.getApiServer().getPath());
diff --git a/src/main/java/io/csviri/jenvtest/binary/BinaryRepo.java b/src/main/java/io/csviri/jenvtest/binary/BinaryRepo.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.binary;
+package io.csviri.jenvtest.binary;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.csviri.jenvtest.JenvtestException;
+import io.csviri.jenvtest.JenvtestException;
+
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
 
diff --git a/src/main/java/io/csviri/jenvtest/binary/OSInfo.java b/src/main/java/io/csviri/jenvtest/binary/OSInfo.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.binary;
+package io.csviri.jenvtest.binary;
 
 public class OSInfo {
 
diff --git a/src/main/java/io/csviri/jenvtest/junit/EnableKubeAPIServer.java b/src/main/java/io/csviri/jenvtest/junit/EnableKubeAPIServer.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.junit;
+package io.csviri.jenvtest.junit;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/src/main/java/io/csviri/jenvtest/junit/KubeAPIServerExtension.java b/src/main/java/io/csviri/jenvtest/junit/KubeAPIServerExtension.java
@@ -1,10 +1,10 @@
-package com.csviri.jenvtest.junit;
+package io.csviri.jenvtest.junit;
 
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
-import com.csviri.jenvtest.KubeAPIServer;
+import io.csviri.jenvtest.KubeAPIServer;
 
 public class KubeAPIServerExtension implements BeforeAllCallback, AfterAllCallback {
 
diff --git a/src/main/java/io/csviri/jenvtest/process/EtcdProcess.java b/src/main/java/io/csviri/jenvtest/process/EtcdProcess.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.process;
+package io.csviri.jenvtest.process;
 
 import java.io.File;
 import java.io.IOException;
@@ -7,9 +7,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.csviri.jenvtest.JenvtestException;
-import com.csviri.jenvtest.Utils;
-import com.csviri.jenvtest.binary.BinaryManager;
+import io.csviri.jenvtest.JenvtestException;
+import io.csviri.jenvtest.Utils;
+import io.csviri.jenvtest.binary.BinaryManager;
 
 public class EtcdProcess {
 
diff --git a/src/main/java/io/csviri/jenvtest/process/KubeAPIServerProcess.java b/src/main/java/io/csviri/jenvtest/process/KubeAPIServerProcess.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.process;
+package io.csviri.jenvtest.process;
 
 import java.io.IOException;
 import java.util.Scanner;
@@ -7,8 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.csviri.jenvtest.*;
-import com.csviri.jenvtest.binary.BinaryManager;
+import io.csviri.jenvtest.*;
+import io.csviri.jenvtest.binary.BinaryManager;
 
 public class KubeAPIServerProcess {
 
diff --git a/src/main/java/io/csviri/jenvtest/process/UnexpectedProcessStopHandler.java b/src/main/java/io/csviri/jenvtest/process/UnexpectedProcessStopHandler.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.process;
+package io.csviri.jenvtest.process;
 
 public interface UnexpectedProcessStopHandler {
 
diff --git a/src/test/java/io/csviri/jenvtest/CertManagerTest.java b/src/test/java/io/csviri/jenvtest/CertManagerTest.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/io/csviri/jenvtest/KubeApiServerTest.java b/src/test/java/io/csviri/jenvtest/KubeApiServerTest.java
@@ -1,10 +1,9 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
-import static com.csviri.jenvtest.TestUtils.testConfigMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class KubeApiServerTest {
@@ -25,8 +24,8 @@ void apiServerWithSpecificVersion() {
   void testWithAPIServer(KubeAPIServer kubeApi) {
     kubeApi.start();
     var client = new KubernetesClientBuilder().build();
-    client.resource(testConfigMap()).create();
-    var cm = client.resource(testConfigMap()).get();
+    client.resource(TestUtils.testConfigMap()).create();
+    var cm = client.resource(TestUtils.testConfigMap()).get();
 
     assertThat(cm).isNotNull();
 
diff --git a/src/test/java/io/csviri/jenvtest/KubernetesMutationHookHandlingTest.java b/src/test/java/io/csviri/jenvtest/KubernetesMutationHookHandlingTest.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -28,6 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.csviri.jenvtest.junit.EnableKubeAPIServer;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.networking.v1.*;
@@ -36,8 +37,6 @@
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.webhook.admission.AdmissionController;
 
-import com.csviri.jenvtest.junit.EnableKubeAPIServer;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
diff --git a/src/test/java/io/csviri/jenvtest/TestUtils.java b/src/test/java/io/csviri/jenvtest/TestUtils.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.util.Map;
 
diff --git a/src/test/java/io/csviri/jenvtest/UtilsTest.java b/src/test/java/io/csviri/jenvtest/UtilsTest.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest;
+package io.csviri.jenvtest;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/io/csviri/jenvtest/binary/BinaryDownloaderTest.java b/src/test/java/io/csviri/jenvtest/binary/BinaryDownloaderTest.java
@@ -1,4 +1,4 @@
-package com.csviri.jenvtest.binary;
+package io.csviri.jenvtest.binary;
 
 import java.util.List;
 
diff --git a/src/test/java/io/csviri/jenvtest/binary/BinaryManagerTest.java b/src/test/java/io/csviri/jenvtest/binary/BinaryManagerTest.java
@@ -1,9 +1,9 @@
-package com.csviri.jenvtest.binary;
+package io.csviri.jenvtest.binary;
 
 import org.junit.jupiter.api.Test;
 
-import com.csviri.jenvtest.JenvtestException;
-import com.csviri.jenvtest.KubeAPIServerConfigBuilder;
+import io.csviri.jenvtest.JenvtestException;
+import io.csviri.jenvtest.KubeAPIServerConfigBuilder;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/io/csviri/jenvtest/junit/JUnitExtensionTest.java b/src/test/java/io/csviri/jenvtest/junit/JUnitExtensionTest.java
@@ -1,12 +1,11 @@
-package com.csviri.jenvtest.junit;
+package io.csviri.jenvtest.junit;
 
 import org.junit.jupiter.api.Test;
 
+import io.csviri.jenvtest.TestUtils;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
-import com.csviri.jenvtest.TestUtils;
-
-import static com.csviri.jenvtest.TestUtils.testConfigMap;
+import static io.csviri.jenvtest.TestUtils.testConfigMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @EnableKubeAPIServer
diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml
@@ -6,7 +6,7 @@
     </Console>
   </Appenders>
   <Loggers>
-    <Logger name="com.csviri.jenvtest" level="debug">
+    <Logger name="io.csviri.jenvtest" level="debug">
     </Logger>
     <Root level="error">
       <AppenderRef ref="Console"/>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.csviri.jenvtest;`
	`1`	`+package io.csviri.jenvtest;`
`2`	`2`
`3`	`3`	`import java.io.File;`
`4`	`4`	`import java.io.FileWriter;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.csviri.jenvtest.binary;`
	`1`	`+package io.csviri.jenvtest.binary;`
`2`	`2`
`3`	`3`	`import java.io.File;`
`4`	`4`