From 95c0b7ec6e162c20e19b9e46df96392b762b5f9b Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 27 May 2025 15:49:47 +0200
Subject: [PATCH] small refactor
---
.../externalservices/kubernetes/RemoteClusterManager.java | 2 +-
.../kubernetes/entities/KClusterDeployment.java | 4 ----
.../containerorchestrators/kubernetes/KubernetesManager.java | 2 +-
.../orchestration/tasks/app/AppRequestVerificationTask.java | 2 +-
.../tasks/app/AppRequestVerificationTaskTest.java | 2 +-
5 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
index 7ab5cf48d..e8a450a03 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
@@ -349,7 +349,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
}
- public boolean clusterExist(Long id) {
+ public boolean clusterExists(Long id) {
return clusterRepository.existsById(id);
}
diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java
index 7db61dcff..a35995704 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/entities/KClusterDeployment.java
@@ -12,10 +12,6 @@ import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import net.geant.nmaas.orchestration.entities.DomainTechDetails;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Optional;
@Entity
@Table(name = "k_cluster_deployment")
diff --git a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java
index 752b3fa95..ab50670ce 100644
--- a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java
+++ b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/KubernetesManager.java
@@ -107,7 +107,7 @@ public class KubernetesManager implements ContainerOrchestrator {
appDeployment.getDescriptiveDeploymentId()
);
//verify cluster
- if(remoteClusterManager.clusterExist(appDeployment.getRemoteClusterId())) {
+ if(remoteClusterManager.clusterExists(appDeployment.getRemoteClusterId())) {
serviceInfo.setRemoteCluster(remoteClusterManager.getCluster(appDeployment.getRemoteClusterId()));
}
diff --git a/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java b/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java
index cd623ce85..1da23840c 100644
--- a/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java
+++ b/src/main/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTask.java
@@ -43,7 +43,7 @@ public class AppRequestVerificationTask {
final AppDeployment appDeployment = repository.findByDeploymentId(deploymentId).orElseThrow(() -> new InvalidDeploymentIdException(deploymentId));
final Application application = appRepository.findById(Long.valueOf(appDeployment.getApplicationId().getValue())).orElseThrow(() ->
new InvalidApplicationIdException("Application for deployment " + deploymentId + " does not exist in repository"));
- if(!remoteClusterManager.clusterExist(appDeployment.getRemoteClusterId())) {
+ if(!remoteClusterManager.clusterExists(appDeployment.getRemoteClusterId())) {
throw new InvalidAttributesException("Wrong remote cluster Id");
}
serviceDeployment.verifyRequest(
diff --git a/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java b/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java
index 53b50f799..622f4cd25 100644
--- a/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java
+++ b/src/test/java/net/geant/nmaas/orchestration/tasks/app/AppRequestVerificationTaskTest.java
@@ -42,7 +42,7 @@ public class AppRequestVerificationTaskTest {
public void shouldTriggerRequestVerify() throws InterruptedException {
when(deployments.findByDeploymentId(deploymentId)).thenReturn(Optional.of(AppDeployment.builder().applicationId(Identifier.newInstance(10L)).build()));
when(applications.findById(any(Long.class))).thenReturn(Optional.of(new Application()));
- when(remoteClusterManager.clusterExist(any())).thenReturn(true);
+ when(remoteClusterManager.clusterExists(any())).thenReturn(true);
task.trigger(new AppVerifyRequestActionEvent(this, deploymentId));
verify(deploy, times(1)).verifyRequest(any(Identifier.class), any(AppDeployment.class), isNull());
}
--
GitLab