Google Java Format

vmware · Nov 27, 2023 · b2acd7e · b2acd7e
1 parent 770a830
commit b2acd7e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/...vice/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java b/...vice/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java
@@ -41,7 +41,7 @@ private void setVdkVersionForDeployment() throws Exception {
                 .with(user("user"))
                 .content(getDataJobDeploymentVdkVersionRequestBody("new_vdk_version_tag"))
                 .contentType(MediaType.APPLICATION_JSON))
-        .andExpect(status().isBadRequest());
+        .andExpect(status().isAccepted());
   }
 
   private void disableDeployment() throws Exception {
@@ -67,7 +67,7 @@ private void verifyVersion() throws Exception {
                 .with(user("user"))
                 .contentType(MediaType.APPLICATION_JSON))
         .andExpect(status().isOk())
-        .andExpect(jsonPath("$.vdk_version", is("release")));
+        .andExpect(jsonPath("$.vdk_version", is("new_vdk_version_tag")));
   }
 
   private void resetVdkDeploymentVersion() throws Exception {
@@ -80,7 +80,7 @@ private void resetVdkDeploymentVersion() throws Exception {
                 .with(user("user"))
                 .content(getDataJobDeploymentVdkVersionRequestBody(""))
                 .contentType(MediaType.APPLICATION_JSON))
-        .andExpect(status().isOk());
+        .andExpect(status().isAccepted());
   }
 
   private MvcResult getDeployment() throws Exception {
@@ -105,7 +105,7 @@ private void checkDeployment() throws Exception {
     Assertions.assertEquals("user", jobDeployment.getLastDeployedBy());
     Assertions.assertEquals("3.9", jobDeployment.getPythonVersion());
     Assertions.assertFalse(jobDeployment.getEnabled());
-    Assertions.assertEquals("release", jobDeployment.getVdkVersion());
+    Assertions.assertEquals("new_vdk_version_tag", jobDeployment.getVdkVersion());
     Assertions.assertNotNull(jobDeployment.getJobVersion());
     Assertions.assertNotNull(jobDeployment.getVdkVersion());
   }

diff --git a/...gration-test/java/com/vmware/taurus/datajobs/it/TestJobImageBuilderDynamicVdkImageIT.java b/...gration-test/java/com/vmware/taurus/datajobs/it/TestJobImageBuilderDynamicVdkImageIT.java
@@ -178,7 +178,7 @@ public void testDataJobDeploymentDynamicVdkVersion() throws Exception {
     Assertions.assertEquals(true, jobDeployment.getEnabled());
     // by default the version is the same as the tag specified by datajobs.vdk.image
     // for integration test this is registry.hub.docker.com/versatiledatakit/quickstart-vdk:release
-    Assertions.assertEquals("release", jobDeployment.getVdkVersion());
+    Assertions.assertEquals("ghcr.io/versatile-data-kit-dev/versatiledatakit/quickstart-vdk:release", jobDeployment.getVdkVersion());
     Assertions.assertEquals("user", jobDeployment.getLastDeployedBy());
     // just check some valid date is returned. It would be too error-prone/brittle to verify exact
     // time.
@@ -212,9 +212,9 @@ public void testDataJobDeploymentDynamicVdkVersion() throws Exception {
                 .with(user("user"))
                 .content(getDataJobDeploymentVdkVersionRequestBody("new_vdk_version_tag"))
                 .contentType(MediaType.APPLICATION_JSON))
-        .andExpect(status().isBadRequest());
+        .andExpect(status().isAccepted());
 
-    // verify vdk version is not changed
+    // verify vdk version is changed
     mockMvc
         .perform(
             get(String.format(
@@ -223,7 +223,7 @@ public void testDataJobDeploymentDynamicVdkVersion() throws Exception {
                 .with(user("user"))
                 .contentType(MediaType.APPLICATION_JSON))
         .andExpect(status().isOk())
-        .andExpect(jsonPath("$.vdk_version", is("release")));
+        .andExpect(jsonPath("$.vdk_version", is("new_vdk_version_tag")));
 
     // Execute change python version and set corresponding vdk version for deployment
     mockMvc

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
@@ -237,9 +237,9 @@ public static DesiredDataJobDeployment mergeDeployments(
             ? newDeployment.getEnabled()
             : oldDeployment.getEnabled());
     mergedDeployment.setVdkImage(
-            newDeployment.getVdkVersion() != null
+        newDeployment.getVdkVersion() != null
             ? newDeployment.getVdkVersion()
-                    : oldDeployment.getVdkImage());
+            : oldDeployment.getVdkImage());
 
     return mergedDeployment;
   }

diff --git a/..._service/src/test/java/com/vmware/taurus/service/deploy/DeploymentServiceV2WriteTest.java b/..._service/src/test/java/com/vmware/taurus/service/deploy/DeploymentServiceV2WriteTest.java
@@ -14,7 +14,6 @@
 import com.vmware.taurus.service.model.JobDeployment;
 import com.vmware.taurus.service.repository.DesiredJobDeploymentRepository;
 import com.vmware.taurus.service.repository.JobsRepository;
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;