Google Java Format

vmware · Dec 14, 2023 · 71a596a · 71a596a
1 parent b74123a
commit 71a596a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/...ines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java b/...ines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java
@@ -376,11 +376,15 @@ public static String getCronJobName(String jobName) {
     return jobName;
   }
 
-  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(JobDeployment jobDeployment) {
+  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(
+      JobDeployment jobDeployment) {
     var passedVdkVersion = jobDeployment.getVdkVersion();
     var vdkVersionSetByPythonVersion =
-            DockerImageName.getTag(supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
+        DockerImageName.getTag(
+            supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
 
-    return passedVdkVersion != null && !passedVdkVersion.isEmpty() && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
+    return passedVdkVersion != null
+        && !passedVdkVersion.isEmpty()
+        && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
   }
 }
diff --git a/...es_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java b/...es_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java
@@ -374,9 +374,9 @@ private KubernetesService.CronJob getCronJob(
             "cp -r $(python -c \"from distutils.sysconfig import get_python_lib;"
                 + " print(get_python_lib())\") /vdk/. && cp /usr/local/bin/vdk /vdk/.");
     var jobVdkImage =
-            isVdkVersionPassedDifferentFromOneSetByPythonVersion(jobDeployment)
-                    ? supportedPythonVersions.replaceVdkVersionInImage(jobDeployment.getVdkVersion())
-                    : supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion());
+        isVdkVersionPassedDifferentFromOneSetByPythonVersion(jobDeployment)
+            ? supportedPythonVersions.replaceVdkVersionInImage(jobDeployment.getVdkVersion())
+            : supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion());
     var jobInitContainer =
         KubernetesService.container(
             "vdk",
@@ -485,11 +485,15 @@ private void handleResourcesException(ParseException e) {
     log.error(errorMessage.toString(), e);
   }
 
-  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(DesiredDataJobDeployment jobDeployment) {
+  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(
+      DesiredDataJobDeployment jobDeployment) {
     var passedVdkVersion = jobDeployment.getVdkVersion();
     var vdkVersionSetByPythonVersion =
-            DockerImageName.getTag(supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
+        DockerImageName.getTag(
+            supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
 
-    return passedVdkVersion != null && !passedVdkVersion.isEmpty() && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
+    return passedVdkVersion != null
+        && !passedVdkVersion.isEmpty()
+        && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
   }
 }
diff --git a/...ntrol_service/src/main/java/com/vmware/taurus/service/deploy/SupportedPythonVersions.java b/...ntrol_service/src/main/java/com/vmware/taurus/service/deploy/SupportedPythonVersions.java
@@ -7,7 +7,6 @@
 
 import java.util.*;
 
-import com.vmware.taurus.service.model.JobDeployment;
 import org.springframework.beans.factory.annotation.Value;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

diff --git a/...l_service/src/test/java/com/vmware/taurus/service/deploy/SupportedPythonVersionsTest.java b/...l_service/src/test/java/com/vmware/taurus/service/deploy/SupportedPythonVersionsTest.java
@@ -5,7 +5,6 @@
 
 package com.vmware.taurus.service.deploy;
 
-import com.vmware.taurus.service.model.JobDeployment;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;