Merge branch 'OWLS-128603' into 'release/4.2'

Add WDT helper utility class to add applications and more

See merge request weblogic-cloud/weblogic-kubernetes-operator!4979

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCreateAuxImageWithImageTool.java

@@ -3,12 +3,14 @@
 
 package oracle.weblogic.kubernetes;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import oracle.weblogic.domain.AuxiliaryImage;
 import oracle.weblogic.domain.DomainResource;
+import oracle.weblogic.kubernetes.actions.impl.WDTArchiveHelper;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
 import oracle.weblogic.kubernetes.actions.impl.primitive.WitParams;
@@ -43,7 +45,6 @@
 import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
-import static oracle.weblogic.kubernetes.actions.TestActions.buildAppArchive;
 import static oracle.weblogic.kubernetes.actions.TestActions.defaultAppParams;
 import static oracle.weblogic.kubernetes.actions.TestActions.deleteImage;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.appAccessibleInPod;
@@ -125,11 +126,17 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
     createSecretWithUsernamePassword(encryptionSecretName, domainNamespace,
         ENCRYPION_USERNAME_DEFAULT, ENCRYPION_PASSWORD_DEFAULT);
 
-    // build app
-    assertTrue(buildAppArchive(defaultAppParams()
-            .srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
-            .appName(MII_BASIC_APP_NAME)),
-        String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
+    try {
+      // createArchive app
+      assertTrue(WDTArchiveHelper
+          .withParams(defaultAppParams()
+              .srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
+              .appName(MII_BASIC_APP_NAME))
+          .createArchive(),
+          String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
+    } catch (IOException ex) {
+      getLogger().severe(ex.getLocalizedMessage());
+    }
   }
 
   /**

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/TestActions.java

@@ -1241,10 +1241,9 @@ public static AppParams defaultAppParams() {
    * @return true if the operation succeeds
    */
   public static boolean buildAppArchive(AppParams params) {
-    return
-        AppBuilder
-            .withParams(params)
-            .build();
+    return AppBuilder
+        .withParams(params)
+        .build();
   }
 
   /**