making changes after review

Author: [email protected]

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

@@ -133,9 +133,6 @@ public void testCreateCoherenceDomainOnPvUsingWlst() throws Exception {
                     testAppName, scriptName, BaseTest.getUsername(), BaseTest.getPassword(),
                     appToDeploy, "dataCluster");
 
-            // Wait some time for deployment to get into Active state
-            Thread.sleep(60 * 1000);
-
             coherenceCacheTest();
 
             testCompletedSuccessfully = true;
@@ -204,9 +201,6 @@ public void testCreateCoherenceDomainInImageUsingWlst() throws Exception {
                     testAppName, scriptName, BaseTest.getUsername(), BaseTest.getPassword(),
                     appToDeploy, "dataCluster");
 
-            // Wait some time for deployment to get into Active state
-            Thread.sleep(60 * 1000);
-
             coherenceCacheTest();
 
             testCompletedSuccessfully = true;
@@ -234,9 +228,6 @@ private static void verifyServersStatus(Domain domain, String[] pods, String dom
     }
 
     private void coherenceCacheTest() throws Exception {
-        //Assume.assumeFalse(QUICKTEST);
-        //String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
-        //logTestBegin(testMethodName);
 
         String[] firstNameList = {"Frodo", "Samwise", "Bilbo", "peregrin", "Meriadoc", "Gandalf"};
         String[] secondNameList = {"Baggins", "Gamgee", "Baggins", "Took", "Brandybuck", "TheGrey"};
@@ -261,7 +252,6 @@ private void coherenceCacheTest() throws Exception {
         result = clearCache();
         logger.info("Cache is cleared and should be empty" + result.stdout());
 
-        //logger.info("SUCCESS - " + testMethodName);
     }
 
     private ExecResult addDataToCache(String firstName, String secondName) throws Exception {

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

@@ -1712,50 +1712,12 @@ public static void buildDeployCoherenceAppInPod(
     // Create app dir in the admin pod
     kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
 
-/*
-    // Create gar directory under the app dir
-    mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
-    mkdirCmd.append(appLocationInPod + "/gar'");
-    kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
-
-    // Create ear directory under the app dir
-    mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
-    mkdirCmd.append(appLocationInPod + "/ear'");
-    kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
-
-    // Create war directory under the app dir if war directory exists in the host
-    if (new File(appLocationOnHost+"/war").exists()) {
-      // Create ear directory under the app dir
-      mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
-      mkdirCmd.append(appLocationInPod + "/war'");
-      kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
-    }
-
-    // Create META-INF in the gar dir
-    mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
-    mkdirCmd.append(appLocationInPod + "/gar/META-INF'");
-    kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
-
-    // Create META-INF in the ear dir
-    mkdirCmd = new StringBuffer(" -- bash -c 'mkdir -p ");
-    mkdirCmd.append(appLocationInPod + "/ear/META-INF'");
-    kubectlexec(adminServerPod, domainNS, mkdirCmd.toString());
-*/
-
     // Copy shell script to the admin pod
     copyFileViaCat(scriptPathOnHost, scriptPathInPod, adminServerPod, domainNS);
 
     // Copy all App files to the admin pod
     copyAppFilesToPod(appLocationOnHost, appLocationInPod, adminServerPod, domainNS);
 
-/*
-    // Copy all App files to the admin pod
-    copyAppFilesToPod(
-        appLocationOnHost + "/gar", appLocationInPod + "/gar", adminServerPod, domainNS);
-    copyAppFilesToPod(
-        appLocationOnHost + "/ear", appLocationInPod + "/ear", adminServerPod, domainNS);
-*/
-
     logger.info("Creating WebService and WebService Servlet Client Applications");
 
     // Run the script to build WAR, EAR or JAR file and deploy the App in the admin pod

integration-tests/src/test/resources/apps/coherenceapp/gar/pof/Contact.java

@@ -1,6 +1,6 @@
-<!-- Copyright 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
-     Licensed under the Universal Permissive License v 1.0 as shown at
-          http://oss.oracle.com/licenses/upl.-->
+// Copyright 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
 
 package com.examples.pof;
 
@@ -10,120 +10,101 @@
 
 import com.tangosol.util.Base;
 
-import java.io.IOException;
-
 import java.util.Date;
 
 /**
- * * @author Sanjay Mantoor *
  *  POF serialization implementation for coherence cache
  */
 public class Contact implements PortableObject {
 
-	private String m_sFirstName;
-	private String m_sLastName;
-
-	public Contact() {
-
-	}
-
-	public Contact(String firstName, String lastName) {
-		m_sFirstName = firstName;
-		m_sLastName = lastName;
-	}
-
-	/**
-	 * * Return the first name. * * @return the first name
-	 */
-	public String getFirstName() {
-		return m_sFirstName;
-	}
-
-	/**
-	 * * Set the first name. * * @param sFirstName the first name
-	 */
-	public void setFirstName(String sFirstName) {
-		m_sFirstName = sFirstName;
-	}
-
-	/**
-	 * * Return the last name. * * @return the last name
-	 */
-	public String getLastName() {
-		return m_sLastName;
-	}
-
-	/**
-	 * * Set the last name. * * @param sLastName the last name
-	 */
-	public void setLastName(String sLastName) {
-		m_sLastName = sLastName;
-	}
-
-	/**
-	 * * {@inheritDoc}
-	 */
-	public void readExternal(PofReader reader) throws IOException {
-		m_sFirstName = reader.readString(FIRSTNAME);
-		m_sLastName = reader.readString(LASTNAME);
-	}
-
-	/**
-	 * * {@inheritDoc}
-	 */
-	public void writeExternal(PofWriter writer) throws IOException {
-		writer.writeString(FIRSTNAME, m_sFirstName);
-		writer.writeString(LASTNAME, m_sLastName);
-	}
-
-	/**
-	 * * {@inheritDoc}
-	 */
-	public String toString() {
-		StringBuilder sb = new StringBuilder(getFirstName()).append(" ").append(getLastName());
-		return sb.toString();
-	}
-
-	/**
-	 * * Returns the hashCode of this {@link Contact}. * * @return the hashCode
-	 * of this {@link Contact}
-	 */
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((m_sFirstName == null) ? 0 : m_sFirstName.hashCode());
-		result = prime * result + ((m_sLastName == null) ? 0 : m_sLastName.hashCode());
-		return result;
-	}
-
-	/**
-	 * * Compares this {@link Contact} with another. * * @param obj
-	 * {@link Contact} to compare to * * @return if the contacts are equal
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-
-		if (obj == null) {
-			return false;
-		}
-
-		Contact that = (Contact) obj;
-
-		return Base.equals(that.getFirstName(), getFirstName()) && Base.equals(that.getLastName(), getLastName());
-	}
-
-	/**
-	 * * The POF index for the FirstName property.
-	 */
-	public static final int FIRSTNAME = 0;
-
-	/**
-	 * * The POF index for the LastName property.
-	 */
-	public static final int LASTNAME = 1;
-
+  // The POF index for the FirstName property.
+  public static final int FIRSTNAME = 0;
+
+  // The POF index for the LastName property.
+  public static final int LASTNAME = 1;
+
+  private String m_sFirstName;
+  private String m_sLastName;
+
+  public Contact() {
+  }
+
+  public Contact(String firstName, String lastName) {
+    m_sFirstName = firstName;
+    m_sLastName = lastName;
+  }
+
+  /**
+   * Return the first name. 
+   */
+  public String getFirstName() {
+    return m_sFirstName;
+  }
+
+  /**
+   * Set the first name.
+   * @param sFirstName the first name
+   */
+  public void setFirstName(String sFirstName) {
+    m_sFirstName = sFirstName;
+  }
+
+  /**
+   * Return the last name.
+   */
+  public String getLastName() {
+    return m_sLastName;
+  }
+
+  /**
+   * Set the last name
+   * @param sLastName the last name
+   */
+  public void setLastName(String sLastName) {
+    m_sLastName = sLastName;
+  }
+
+  public void readExternal(PofReader reader) throws IOException {
+    m_sFirstName = reader.readString(FIRSTNAME);
+    m_sLastName = reader.readString(LASTNAME);
+  }
+
+  public void writeExternal(PofWriter writer) throws IOException {
+    writer.writeString(FIRSTNAME, m_sFirstName);
+    writer.writeString(LASTNAME, m_sLastName);
+  }
+
+  public String toString() {
+    StringBuilder sb = new StringBuilder(getFirstName()).append(" ").append(getLastName());
+    return sb.toString();
+  }
+
+  /**
+   * Returns the hashCode of the Contact
+   */
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+
+    result = prime * result + ((m_sFirstName == null) ? 0 : m_sFirstName.hashCode());
+    result = prime * result + ((m_sLastName == null) ? 0 : m_sLastName.hashCode());
+    return result;
+  }
+
+  /**
+   * Compares this Contact with another
+   * @param obj
+   */
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null) {
+      return false;
+    }
+    Contact that = (Contact) obj;
+    return Base.equals(that.getFirstName(), getFirstName()) && Base.equals(that.getLastName(), getLastName());
+  }
 }