Google Java Format

vmware · Dec 14, 2023 · c2f0c28 · c2f0c28
1 parent 1257409
commit c2f0c28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...es_control_service/src/main/java/com/vmware/taurus/datajobs/DeploymentModelConverter.java b/...es_control_service/src/main/java/com/vmware/taurus/datajobs/DeploymentModelConverter.java
@@ -268,8 +268,9 @@ private static void checkDeploymentsCanBeMerged(
   }
 
   private static void resetVdkVersionIfPythonVersionChange(
-          DesiredDataJobDeployment oldDeployment, DesiredDataJobDeployment newDeployment) {
-    if (newDeployment.getPythonVersion() != null && !oldDeployment.getPythonVersion().equals(newDeployment.getPythonVersion())) {
+      DesiredDataJobDeployment oldDeployment, DesiredDataJobDeployment newDeployment) {
+    if (newDeployment.getPythonVersion() != null
+            && oldDeployment.getPythonVersion() != null && !oldDeployment.getPythonVersion().equals(newDeployment.getPythonVersion())) {
       newDeployment.setVdkVersion(null);
     }
   }

diff --git a/...nes_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java b/...nes_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java
@@ -272,8 +272,10 @@ private void setPythonVersionIfNull(JobDeployment oldDeployment, JobDeployment n
     }
   }
 
-  private void resetVdkVersionIfPythonVersionChange(JobDeployment oldDeployment, JobDeployment newDeployment) {
-    if (newDeployment.getPythonVersion() != null && !oldDeployment.getPythonVersion().equals(newDeployment.getPythonVersion())) {
+  private void resetVdkVersionIfPythonVersionChange(
+      JobDeployment oldDeployment, JobDeployment newDeployment) {
+    if (newDeployment.getPythonVersion() != null
+        && oldDeployment.getPythonVersion() != null && !oldDeployment.getPythonVersion().equals(newDeployment.getPythonVersion())) {
       newDeployment.setVdkVersion(null);
     }
   }