refactor: ApplyService only accessible through JKubeServiceHub

Signed-off-by: Marc Nuri <marc@marcnuri.com>
eclipse-jkube · Jan 11, 2024 · d8a1edd · d8a1edd
1 parent 275dc11
commit d8a1edd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/...e-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ApplyService.java b/...e-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ApplyService.java
@@ -104,7 +104,7 @@ public class ApplyService {
     // This map is to track projects created.
     private static final Set<String> projectsCreated = new HashSet<>();
 
-    public ApplyService(JKubeServiceHub serviceHub) {
+    ApplyService(JKubeServiceHub serviceHub) {
         this.kubernetesClient = serviceHub.getClient();
         this.log = serviceHub.getLog();
         this.patchService = new PatchService(kubernetesClient);

diff --git a/...nfig/service/src/test/java/org/eclipse/jkube/kit/config/service/ApplyServiceCrudTest.java b/...nfig/service/src/test/java/org/eclipse/jkube/kit/config/service/ApplyServiceCrudTest.java
@@ -80,7 +80,7 @@ void setUp() {
       .platformMode(RuntimeMode.KUBERNETES)
       .clusterAccess(new ClusterAccess(ClusterConfiguration.from(kubernetesClient.getConfiguration()).build()))
       .build();
-    applyService = new ApplyService(serviceHub);
+    applyService = serviceHub.getApplyService();
     applyService.setNamespace("default");
     kubernetesMockServer.expect()
       .get()

diff --git a/...t/config/service/src/test/java/org/eclipse/jkube/kit/config/service/ApplyServiceTest.java b/...t/config/service/src/test/java/org/eclipse/jkube/kit/config/service/ApplyServiceTest.java
@@ -86,7 +86,7 @@ void setUp() {
         .platformMode(RuntimeMode.KUBERNETES)
         .clusterAccess(new ClusterAccess(ClusterConfiguration.from(client.getConfiguration()).build()))
         .build();
-      applyService = new ApplyService(serviceHub);
+      applyService = serviceHub.getApplyService();
       applyService.setNamespace("default");
       // In OpenShift
       mockServer.expect()

diff --git a/...t/config/service/src/test/java/org/eclipse/jkube/kit/config/service/DebugServiceTest.java b/...t/config/service/src/test/java/org/eclipse/jkube/kit/config/service/DebugServiceTest.java
@@ -92,9 +92,8 @@ void setUp() {
       .clusterAccess(new ClusterAccess(ClusterConfiguration.from(kubernetesClient.getConfiguration()).build()))
       .build();
     singleThreadExecutor = Executors.newSingleThreadExecutor();
-    final ApplyService applyService = new ApplyService(serviceHub);
-    applyService.setNamespace(kubernetesClient.getNamespace());
-    debugService = new DebugService(logger, kubernetesClient, new PortForwardService(logger), applyService);
+    serviceHub.getApplyService().setNamespace(kubernetesClient.getNamespace());
+    debugService = new DebugService(logger, kubernetesClient, new PortForwardService(logger), serviceHub.getApplyService());
   }
 
   @AfterEach