Rename

Author: EliXorZz

common/src/main/java/fr/epsilon/common/Epsilon.java

@@ -1,20 +1,17 @@
 package fr.epsilon.common;
 
 import com.google.gson.Gson;
-import fr.epsilon.common.crd.EpsilonInstance;
-import fr.epsilon.common.crd.EpsilonInstanceList;
+import fr.epsilon.common.crd.EpsilonInstanceCRD;
+import fr.epsilon.common.crd.EpsilonInstanceCRDList;
 import fr.epsilon.common.instance.EInstance;
-import fr.epsilon.common.instance.EInstanceList;
 import fr.epsilon.common.instance.EInstanceModule;
 import fr.epsilon.common.queue.EQueueModule;
 import fr.epsilon.common.template.ETemplate;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.openapi.ApiClient;
-import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.util.Config;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 import okhttp3.*;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.FileReader;
 import java.io.IOException;
@@ -30,7 +27,7 @@ public class Epsilon {
     private final EQueueModule queueModule;
 
     private SharedInformerFactory informerFactory;
-    private GenericKubernetesApi<EpsilonInstance, EpsilonInstanceList> epsilonInstanceClient;
+    private GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> epsilonInstanceClient;
 
     private ETemplate template;
 
@@ -39,7 +36,7 @@ public Epsilon() {
             ApiClient kubeClient = Config.defaultClient();
 
             this.informerFactory = new SharedInformerFactory(kubeClient);
-            this.epsilonInstanceClient = new GenericKubernetesApi<>(EpsilonInstance.class, EpsilonInstanceList.class, "controller.epsilon.fr", "v1", "epsiloninstances", kubeClient);
+            this.epsilonInstanceClient = new GenericKubernetesApi<>(EpsilonInstanceCRD.class, EpsilonInstanceCRDList.class, "controller.epsilon.fr", "v1", "epsiloninstances", kubeClient);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -70,7 +67,7 @@ public SharedInformerFactory getInformerFactory() {
         return informerFactory;
     }
 
-    public GenericKubernetesApi<EpsilonInstance, EpsilonInstanceList> getEpsilonInstanceClient() {
+    public GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> getEpsilonInstanceClient() {
         return epsilonInstanceClient;
     }
 

common/src/main/java/fr/epsilon/common/crd/EpsilonInstance.java renamed to common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceCRD.java

@@ -4,7 +4,7 @@
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 
-public class EpsilonInstance implements KubernetesObject {
+public class EpsilonInstanceCRD implements KubernetesObject {
     public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
 
     public static final String SERIALIZED_NAME_KIND = "kind";
@@ -23,7 +23,7 @@ public class EpsilonInstance implements KubernetesObject {
     private V1ObjectMeta metadata;
 
     @SerializedName(SERIALIZED_NAME_STATUS)
-    private EpsilonInstanceStatus status;
+    private EpsilonInstanceCRDStatus status;
 
     @Override
     public V1ObjectMeta getMetadata() {
@@ -44,7 +44,7 @@ public String getName() {
         return metadata.getName();
     }
 
-    public EpsilonInstanceStatus getStatus() {
+    public EpsilonInstanceCRDStatus getStatus() {
         return status;
     }
 }

common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceList.java renamed to common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceCRDList.java

@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class EpsilonInstanceList implements KubernetesListObject {
+public class EpsilonInstanceCRDList implements KubernetesListObject {
     public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
 
     public static final String SERIALIZED_NAME_API_ITEMS = "items";
@@ -20,7 +20,7 @@ public class EpsilonInstanceList implements KubernetesListObject {
     private String apiVersion;
 
     @SerializedName(SERIALIZED_NAME_API_ITEMS)
-    private List<EpsilonInstance> items = new ArrayList<>();
+    private List<EpsilonInstanceCRD> items = new ArrayList<>();
 
     @SerializedName(SERIALIZED_NAME_KIND)
     private String kind;
@@ -34,7 +34,7 @@ public V1ListMeta getMetadata() {
     }
 
     @Override
-    public List<EpsilonInstance> getItems() {
+    public List<EpsilonInstanceCRD> getItems() {
         return items;
     }
 

common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceStatus.java renamed to common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceCRDStatus.java

@@ -4,7 +4,7 @@
 import fr.epsilon.common.instance.EState;
 import fr.epsilon.common.instance.EType;
 
-public class EpsilonInstanceStatus {
+public class EpsilonInstanceCRDStatus {
     public static final String SERIALIZED_NAME_IP = "ip";
 
     public static final String SERIALIZED_NAME_TEMPLATE = "template";

proxy/src/main/java/fr/epsilon/exporter/listener/EpsilonRegister.java

@@ -1,9 +1,9 @@
 package fr.epsilon.exporter.listener;
 
 import fr.epsilon.common.Epsilon;
-import fr.epsilon.common.crd.EpsilonInstance;
-import fr.epsilon.common.crd.EpsilonInstanceList;
-import fr.epsilon.common.crd.EpsilonInstanceStatus;
+import fr.epsilon.common.crd.EpsilonInstanceCRD;
+import fr.epsilon.common.crd.EpsilonInstanceCRDList;
+import fr.epsilon.common.crd.EpsilonInstanceCRDStatus;
 import fr.epsilon.common.instance.EState;
 import fr.epsilon.common.instance.EType;
 import fr.epsilon.exporter.EpsilonExporter;
@@ -51,31 +51,31 @@ public EpsilonRegister(EpsilonExporter main) {
     }
 
     public void runInformer() {
-        GenericKubernetesApi<EpsilonInstance, EpsilonInstanceList> epsilonInstanceClient = Epsilon.get().getEpsilonInstanceClient();
+        GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> epsilonInstanceClient = Epsilon.get().getEpsilonInstanceClient();
         SharedInformerFactory informerFactory = Epsilon.get().getInformerFactory();
-        SharedInformer<EpsilonInstance> instanceInformer = informerFactory.sharedIndexInformerFor(epsilonInstanceClient,
-                EpsilonInstance.class, TimeUnit.MINUTES.toMillis(10), namespace);
+        SharedInformer<EpsilonInstanceCRD> instanceInformer = informerFactory.sharedIndexInformerFor(epsilonInstanceClient,
+                EpsilonInstanceCRD.class, TimeUnit.MINUTES.toMillis(10), namespace);
 
         try {
-            KubernetesApiResponse<EpsilonInstanceList> instanceList = epsilonInstanceClient.list(namespace).throwsApiException();
-            for (EpsilonInstance instance : instanceList.getObject().getItems())
+            KubernetesApiResponse<EpsilonInstanceCRDList> instanceList = epsilonInstanceClient.list(namespace).throwsApiException();
+            for (EpsilonInstanceCRD instance : instanceList.getObject().getItems())
                 registerInstance(instance);
         } catch (ApiException e) {
             e.printStackTrace();
         }
 
-        instanceInformer.addEventHandlerWithResyncPeriod(new ResourceEventHandler<EpsilonInstance>() {
+        instanceInformer.addEventHandlerWithResyncPeriod(new ResourceEventHandler<EpsilonInstanceCRD>() {
             @Override
-            public void onAdd(EpsilonInstance instance) {
+            public void onAdd(EpsilonInstanceCRD instance) {
             }
 
             @Override
-            public void onUpdate(EpsilonInstance oldInstance, EpsilonInstance newInstance) {
+            public void onUpdate(EpsilonInstanceCRD oldInstance, EpsilonInstanceCRD newInstance) {
                 registerInstance(newInstance);
             }
 
             @Override
-            public void onDelete(EpsilonInstance instance, boolean deletedFinalStateUnknown) {
+            public void onDelete(EpsilonInstanceCRD instance, boolean deletedFinalStateUnknown) {
                 V1ObjectMeta metadata = instance.getMetadata();
                 String name = metadata.getName();
 
@@ -92,8 +92,8 @@ public List<ServerInfo> getHubs() {
                 .collect(Collectors.toList());
     }
 
-    private void registerInstance(EpsilonInstance instance) {
-        EpsilonInstanceStatus status = instance.getStatus();
+    private void registerInstance(EpsilonInstanceCRD instance) {
+        EpsilonInstanceCRDStatus status = instance.getStatus();
 
         if (status != null) {
             String name = instance.getName();