Minor cleanup

Signed-off-by: Dongbo Xiao <[email protected]>

Author: doxiao

kubernetes/internal/create-weblogic-domain.sh

@@ -157,7 +157,7 @@ function validateWeblogicDomainStorageType {
       "HOST_PATH")
       ;;
       "NFS")
-        validateInputParamsSpecified weblogicDomainStorageNFSServer        
+        validateInputParamsSpecified weblogicDomainStorageNFSServer
       ;;
       *)
         validationError "Invalid value for weblogicDomainStorageType: ${weblogicDomainStorageType}. Valid values are HOST_PATH and NFS."

src/test/java/oracle/kubernetes/operator/create/CreateDomainInputsValidationTest.java

@@ -215,38 +215,12 @@ public void createDomain_with_invalidManagedServerPort_failsAndReturnsError() th
       failsAndPrints(invalidIntegerParamValueError(PARAM_MANAGED_SERVER_PORT, val)));
   }
 
-  @Test
-  public void createDomain_with_invalidWeblogicDomainStorageReclaimPolicy_failsAndReturnsError() throws Exception {
-    String val = "invalid-storage-reclaim-policy";
-    assertThat(
-      execCreateDomain(newInputs().weblogicDomainStorageReclaimPolicy(val)),
-      failsAndPrints(invalidEnumParamValueError(PARAM_WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY, val)));
-  }
-
-  @Test
-  public void createDomain_with_weblogicDomainStorageReclaimPolicyDeleteAndNonTmoWeblogicDomainStoragePath_failsAndReturnsError() throws Exception {
-    assertThat(
-      execCreateDomain(newInputs().weblogicDomainStorageReclaimPolicy(STORAGE_RECLAIM_POLICY_DELETE).weblogicDomainStoragePath("/scratch")),
-      failsAndPrints(invalidRelatedParamValueError(PARAM_WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY, STORAGE_RECLAIM_POLICY_DELETE, 
-                                              PARAM_WEBLOGIC_DOMAIN_STORAGE_PATH, "/scratch")));
-  }
-
-  @Test
-  public void createDomain_with_weblogicDomainStorageReclaimPolicyDelete_and_tmpWeblogicDomainStoragePath_succeeds() throws Exception {
-    GeneratedDomainYamlFiles
-      .generateDomainYamlFiles(
-        newInputs()
-          .weblogicDomainStorageReclaimPolicy(STORAGE_RECLAIM_POLICY_DELETE)
-          .weblogicDomainStoragePath("/tmp/"))
-      .remove();
-  }
-
   @Test
   public void createDomain_with_weblogicDomainStorageTypeNfsAndMissingWeblogicDomainStorageNFSServer_failsAndReturnsError() throws Exception {
      assertThat(
       execCreateDomain(newInputs().weblogicDomainStorageType(STORAGE_TYPE_NFS).weblogicDomainStorageNFSServer("")),
       failsAndPrints(paramMissingError(PARAM_WEBLOGIC_DOMAIN_STORAGE_NFS_SERVER)));
-   }
+  }
 
   @Test
   public void createDomain_with_invalidWeblogicDomainStorageType_failsAndReturnsError() throws Exception {
@@ -273,6 +247,32 @@ public void createDomain_with_missingWeblogicDomainStoragePath_failsAndReturnsEr
       failsAndPrints(paramMissingError(PARAM_WEBLOGIC_DOMAIN_STORAGE_PATH)));
   }
 
+  @Test
+  public void createDomain_with_invalidWeblogicDomainStorageReclaimPolicy_failsAndReturnsError() throws Exception {
+    String val = "invalid-storage-reclaim-policy";
+    assertThat(
+      execCreateDomain(newInputs().weblogicDomainStorageReclaimPolicy(val)),
+      failsAndPrints(invalidEnumParamValueError(PARAM_WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY, val)));
+  }
+
+  @Test
+  public void createDomain_with_weblogicDomainStorageReclaimPolicyDeleteAndNonTmoWeblogicDomainStoragePath_failsAndReturnsError() throws Exception {
+    assertThat(
+      execCreateDomain(newInputs().weblogicDomainStorageReclaimPolicy(STORAGE_RECLAIM_POLICY_DELETE).weblogicDomainStoragePath("/scratch")),
+      failsAndPrints(invalidRelatedParamValueError(PARAM_WEBLOGIC_DOMAIN_STORAGE_RECLAIM_POLICY, STORAGE_RECLAIM_POLICY_DELETE, 
+                                              PARAM_WEBLOGIC_DOMAIN_STORAGE_PATH, "/scratch")));
+  }
+
+  @Test
+  public void createDomain_with_weblogicDomainStorageReclaimPolicyDelete_and_tmpWeblogicDomainStoragePath_succeeds() throws Exception {
+    GeneratedDomainYamlFiles
+      .generateDomainYamlFiles(
+        newInputs()
+          .weblogicDomainStorageReclaimPolicy(STORAGE_RECLAIM_POLICY_DELETE)
+          .weblogicDomainStoragePath("/tmp/"))
+      .remove();
+  }
+
   @Test
   public void createDomain_with_missingWeblogicDomainStorageSize_failsAndReturnsError() throws Exception {
     assertThat(