CheckStyle fixes

Author: rjeberhard

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

@@ -6,6 +6,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
@@ -38,7 +39,7 @@ public class ItCoherenceTests extends BaseTest {
    * initialization of the integration test properties defined in OperatorIT.properties and setting
    * the resultRoot, pvRoot and projectRoot attributes. Also, create the operator.
    *
-   * @throws Exception
+   * @throws Exception exception
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
@@ -50,9 +51,9 @@ public static void staticPrepare() throws Exception {
   }
 
   /**
-   * Releases k8s cluster lease, archives result, pv directories and destroy the operator
+   * Releases k8s cluster lease, archives result, pv directories and destroy the operator.
    *
-   * @throws Exception
+   * @throws Exception exception
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
@@ -101,8 +102,8 @@ private static void copyAndExecuteProxyClientInPod(String cacheOp) {
       final String domainNS = domain.getDomainNs();
 
       // Use the proxy running on Managed Server 1, get the internal POD IP
-      String podName = domain.getManagedSeverPodName(1);
-      String ProxyIP = TestUtils.getPodIP(domainNS, "", podName);
+      final String podName = domain.getManagedSeverPodName(1);
+      final String ProxyIP = TestUtils.getPodIP(domainNS, "", podName);
 
       String cohAppLocationOnHost = BaseTest.getAppLocationOnHost() + "/" + PROXY_CLIENT_APP_NAME;
       String cohAppLocationInPod = BaseTest.getAppLocationInPod() + "/" + PROXY_CLIENT_APP_NAME;
@@ -140,20 +141,19 @@ private static void copyAndExecuteProxyClientInPod(String cacheOp) {
   }
 
   /**
-   * Create the domain
+   * Create the domain.
    *
-   * @return
-   * @throws Exception
+   * @return domain
+   * @throws Exception exception
    */
   private Domain createDomain() throws Exception {
 
-    Map<String, String> envMap = new HashMap();
+    Map<String, String> envMap = new HashMap<>();
 
     // Set this ENV var with the WDT archive so that it is included in the image build.
     envMap.put("CUSTOM_WDT_ARCHIVE", buildProxyServerWdtZip());
 
     // create domain
-    Domain domain = null;
     Map<String, Object> domainMap = TestUtils.loadYaml(DOMAININIMAGE_WDT_YAML);
     domainMap.put("namespace", "test1");
     domainMap.put("domainUID", "coh");
@@ -163,15 +163,15 @@ private Domain createDomain() throws Exception {
         "customWdtTemplate",
         BaseTest.getProjectRoot()
             + "/integration-tests/src/test/resources/wdt/coh-wdt-config.yaml");
-    domain = TestUtils.createDomain(domainMap);
+    Domain domain = TestUtils.createDomain(domainMap);
     domain.verifyDomainCreated();
-      return domain;
+    return domain;
   }
 
   /**
-   * Destroy the domain
+   * Destroy the domain.
    *
-   * @throws Exception
+   * @throws Exception exception
    */
   private static void destroyDomain() throws Exception {
     if (domain != null) {
@@ -184,7 +184,7 @@ private static void destroyDomain() throws Exception {
    * Verify that all the server pods in the domain got re-started. The property tested is: env:
    * "-Dweblogic.StdoutDebugEnabled=false"--> "-Dweblogic.StdoutDebugEnabled=true"
    *
-   * @throws Exception
+   * @throws Exception exception
    */
   private void restartDomainByChangingEnvProperty() throws Exception {
 
@@ -200,7 +200,7 @@ private void restartDomainByChangingEnvProperty() throws Exception {
   }
 
   /**
-   * Build the WDT zip that contains the Coherence proxy server
+   * Build the WDT zip that contains the Coherence proxy server.
    *
    * @return the WDT zip path
    */

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

@@ -37,10 +37,10 @@ public class ItElasticLogging extends BaseTest {
   private static final String elasticStackYamlLoc =
       "kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml";
   private final String loggingJarRepos = 
-    "https://github.com/oracle/weblogic-logging-exporter/releases/download/v0.1.1";
+      "https://github.com/oracle/weblogic-logging-exporter/releases/download/v0.1.1";
   private final String wlsLoggingExpJar = "weblogic-logging-exporter-0.1.1.jar";
   private final String snakeyamlJarRepos = 
-    "https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.23";
+      "https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.23";
   private final String snakeyamlJar = "snakeyaml-1.23.jar";
   private static Operator operator;
   private static Domain domain;
@@ -224,13 +224,13 @@ public void testWeblogicLogSearch() throws Exception {
    * @throws Exception exception
    */
   @Test
-  public void testWLSLoggingExporter() throws Exception {
+  public void testWlsLoggingExporter() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
     // Download Weblogic logging exporter 
-    downloadWLSLoggingExporterJars();
+    downloadWlsLoggingExporterJars();
     // Copy required resources to all wls server pods
     copyResourceFilesToAllPods();
 
@@ -265,7 +265,7 @@ private static void verifyLoggingExpReady(String index) throws Exception {
     Assume.assumeNotNull(indexStatus);
     Assume.assumeNotNull(indexName);
 
-    if(!index.equalsIgnoreCase(kibanaIndexKey)) {
+    if (!index.equalsIgnoreCase(kibanaIndexKey)) {
       // Add the logstash and wls index name to a Map
       testVarMap.put(index, indexName);
     }
@@ -278,16 +278,14 @@ private static void verifyLoggingExpReady(String index) throws Exception {
     String[] indexNameArr = 
       indexName.split(System.getProperty("line.separator"));
 
-    for(int i = 0; i < indexStatusArr.length; i++) {
-      logger.info("Health status of " + indexNameArr[i] + 
-                  " is: " + healthStatusArr[i]);
-      logger.info("Index status of " + indexNameArr[i] + 
-                  " is: " + indexStatusArr[i]);
+    for (int i = 0; i < indexStatusArr.length; i++) {
+      logger.info("Health status of " + indexNameArr[i] + " is: " + healthStatusArr[i]);
+      logger.info("Index status of " + indexNameArr[i] + " is: " + indexStatusArr[i]);
       // Verify that the health status of index
       Assume.assumeTrue(
           index + " is not ready!",
-          healthStatusArr[i].trim().equalsIgnoreCase("yellow") || 
-          healthStatusArr[i].trim().equalsIgnoreCase("green"));
+          healthStatusArr[i].trim().equalsIgnoreCase("yellow")
+              || healthStatusArr[i].trim().equalsIgnoreCase("green"));
       // Verify that the index is open for use
       Assume.assumeTrue(index + " index is not open!", 
                         indexStatusArr[i].trim().equalsIgnoreCase("open"));
@@ -395,7 +393,7 @@ private String execSearchQuery(String queryCriteria, String index) throws Except
     return result.stdout();
   }
 
-  private void downloadWLSLoggingExporterJars() throws Exception {
+  private void downloadWlsLoggingExporterJars() throws Exception {
     File loggingJatReposDir = new File(loggingExpArchiveLoc);
 
     if (loggingJatReposDir.list().length == 0) {
@@ -455,8 +453,7 @@ private void copyResourceFilesToAllPods() throws Exception  {
 
   private void copyResourceFilesToOnePod(String serverName, String domainNS) 
       throws Exception {
-    String resourceDir = 
-      BaseTest.getProjectRoot() + "/integration-tests/src/test/resources";
+    String resourceDir = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources";
     String testResourceDir = resourceDir + "/loggingexporter";
     final String loggingYamlFile = "WebLogicLoggingExporter.yaml";
 

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

@@ -226,10 +226,10 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       if (!domainUidsToBeDeleted.equals("")) {
         logger.info("About to delete domains: " + domainUidsToBeDeleted);
         TestUtils.deleteWeblogicDomainResources(domainUidsToBeDeleted);
-        if(domain1 != null) {
+        if (domain1 != null) {
           TestUtils.verifyAfterDeletion(domain1);
         }
-        if(domain2 != null) {
+        if (domain2 != null) {
           TestUtils.verifyAfterDeletion(domain2);
         }
       }
@@ -312,11 +312,11 @@ public void testTwoDomainsManagedByOneOperatorSharingPV() throws Exception {
       if (!domainUidsToBeDeleted.equals("")) {
         logger.info("About to delete domains: " + domainUidsToBeDeleted);
         TestUtils.deleteWeblogicDomainResources(domainUidsToBeDeleted);
-        if(domain1 != null) {
+        if (domain1 != null) {
           TestUtils.verifyAfterDeletion(domain1);
         }
-        if(domain2 != null) {
-        TestUtils.verifyAfterDeletion(domain2);
+        if (domain2 != null) {
+          TestUtils.verifyAfterDeletion(domain2);
         }
       }
     }