Synced up with develop branch

Author: hzhao-github

integration-tests/src/test/java/oracle/kubernetes/operator/ITSessionMigration.java

@@ -150,7 +150,7 @@ public void testRepickPrimary() throws Exception {
 
     // Restore test env
     // Wait some time for ms pod to become ready
-    Thread.sleep(30 * 1000);
+    // Thread.sleep(30 * 1000);
     TestUtils.checkPodReady(domainUid + "-" + primaryServName1, domainNS);
 
     logger.info(
@@ -210,7 +210,7 @@ public void testHttpSessionMigr() throws Exception {
 
     // Restore test env
     // Wait some time for ms pod to become ready
-    Thread.sleep(30 * 1000);
+    // Thread.sleep(30 * 1000);
     TestUtils.checkPodReady(domainUid + "-" + primaryServName1, domainNS);
 
     logger.info("SUCCESS - " + testMethodName + ". HTTP session state is migrated!");

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -1597,17 +1597,18 @@ public void restartManagedServerUsingServerStartPolicy(String msName) throws Exc
   }
 
   /**
-   * Run the shell script to build .war file and deploy the App in the admin pod
+   * Run the shell script to build WAR, EAR or JAR file and deploy the App in the admin pod
    *
    * @param webappName - Web App Name to be deployed
-   * @param scriptName - a shell script to build .war file and deploy the App in the admin pod
+   * @param scriptName - a shell script to build WAR, EAR or JAR file and deploy the App in the
+   *     admin pod
    * @param archiveExt - archive extention
    * @param infoDirNames - archive information dir location
    * @param username - weblogic user name
    * @param password - weblogc password
    * @throws Exception
    */
-  private void callShellScriptToBuildWarDeployAppInPod(
+  private void callShellScriptToBuildDeployAppInPod(
       String webappName,
       String scriptName,
       String archiveExt,
@@ -1678,10 +1679,11 @@ private void callShellScriptToBuildWarDeployAppInPod(
 
   /**
    * Create dir to save Web App files Copy the shell script file and all App files over to the admin
-   * pod Run the shell script to build .war file and deploy the App in the admin pod
+   * pod Run the shell script to build WAR, EAR or JAR file and deploy the App in the admin pod
    *
    * @param appName - Java App name to be deployed
-   * @param scriptName - a shell script to build .war file and deploy the App in the admin pod
+   * @param scriptName - a shell script to build WAR, EAR or JAR file and deploy the App in the
+   *     admin pod
    * @param username - weblogic user name
    * @param password - weblogc password
    * @param args - by default, a WAR file is created for a Web App and a EAR file is created for EJB
@@ -1698,9 +1700,12 @@ public void buildDeployJavaAppInPod(
     String scriptPathOnHost = BaseTest.getAppLocationOnHost() + "/" + scriptName;
     String scriptPathInPod = BaseTest.getAppLocationInPod() + "/" + scriptName;
 
+    // Default velues to build archive file
     final String initInfoDirName = "WEB-INF";
     String archiveExt = "war";
     String infoDirName = initInfoDirName;
+
+    // Get archive info dir name
     File appFiles = new File(appLocationOnHost);
 
     String[] subDirArr =
@@ -1714,6 +1719,7 @@ public boolean accept(File dir, String name) {
 
     List<String> subDirList = Arrays.asList(subDirArr);
 
+    // Check archive file type
     if (!subDirList.contains(infoDirName)) {
       infoDirName = "META-INF";
       // Create .ear file or .jar file for EJB
@@ -1722,10 +1728,9 @@ public boolean accept(File dir, String name) {
 
     logger.info("Build and deploy: " + appName + "." + archiveExt + " in the admin pod");
 
+    // Create app dir in the admin pod
     StringBuffer mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
     mkdirCmd.append(appLocationInPod).append("/" + infoDirName + "'");
-
-    // Create app dir in the pod
     TestUtils.kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
 
     // Copy shell script to the pod
@@ -1734,8 +1739,8 @@ public boolean accept(File dir, String name) {
     // Copy all App files to the admin pod
     TestUtils.copyAppFilesToPod(appLocationOnHost, appLocationInPod, adminServerPod, domainNS);
 
-    // Run the script to build .war file and deploy the App in the pod
-    callShellScriptToBuildWarDeployAppInPod(
+    // Run the script to build WAR, EAR or JAR file and deploy the App in the admin pod
+    callShellScriptToBuildDeployAppInPod(
         appName, scriptName, archiveExt, infoDirName, username, password);
   }
 }

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -447,7 +447,7 @@ public static ExecResult kubectlexecNoCheck(String podName, String namespace, St
    * Copy all App files to the k8s pod
    *
    * @param appLocationOnHost - App location on the local host
-   * @param appLocationInPod - App location on the lk8s pod
+   * @param appLocationInPod - App location on the k8s pod
    * @param podName - the k8s pod name
    * @param namespace - namespace the k8s pod is in
    * @throws Exception

integration-tests/src/test/resources/apps/httpsessionreptestapp/CounterServlet.java

@@ -4,13 +4,16 @@
 
 package apps.httpsessionreptestapp;
 
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.ServletException;
 import weblogic.servlet.internal.session.RSID;
 import weblogic.servlet.internal.MembershipControllerImpl;
 import weblogic.servlet.spi.WebServerRegistry;
-import java.util.Enumeration;
 
 /**
  * Simple HTTP servlet class for a client to