More checkstyle

Author: rjeberhard

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

@@ -169,14 +169,14 @@ private static void gitCloneMonitoringExporter() throws Exception {
   }
 
   /**
-   * Build monitoring exporter app
+   * Build monitoring exporter app.
    *
    * @throws Exception if could not run the command successfully to clone from github
    */
   private static void buildMonitoringExporter() throws Exception {
     String monitoringExporterSrcDir = monitoringExporterDir + "/src";
     // target dir for monitoring exporter webapp
-    String monitoringExporterWar =
+    final String monitoringExporterWar =
         monitoringExporterDir + "/apps/monitoringexporter/wls-exporter.war";
 
     // build monitoring exporter project
@@ -827,7 +827,7 @@ public void test19_EndToEndViaChart() throws Exception {
     } finally {
       /*
       uninstallWebHookPrometheusGrafanaViaChart();
-      uninstallMySQL();
+      uninstallMysql();
 
       String crdCmd =
           " kubectl delete -f " + monitoringExporterEndToEndDir + "/demo-domains/domain1.yaml";
@@ -1213,7 +1213,7 @@ private static void uninstallWebHookPrometheusGrafanaViaChart() throws Exception
    *
    * @throws Exception if could not run the command successfully to uninstall MySQL
    */
-  private static void uninstallMySQL() throws Exception {
+  private static void uninstallMysql() throws Exception {
     String monitoringExporterEndToEndDir =
         monitoringExporterDir + "/src/samples/kubernetes/end2end/";
     // unnstall mysql
@@ -1263,27 +1263,6 @@ private static void replaceStringInFile(String filePath, String oldValue, String
     Files.write(src, content.getBytes(charset));
   }
 
-  /**
-   * A utility method to copy Cross Namespaces RBAC yaml template file replacing the DOMAIN_NS,
-   * OPERATOR_NS.
-   *
-   * @throws IOException when copying files from source location to staging area fails
-   */
-  private static void createCrossNSRBACFile(String domainNS, String operatorNS) throws IOException {
-    String samplesDir = monitoringExporterDir + "/src/samples/kubernetes/deployments/";
-    Path src = Paths.get(samplesDir + "/crossnsrbac.yaml");
-    Path dst = Paths.get(samplesDir + "/crossnsrbac_" + domainNS + "_" + operatorNS + ".yaml");
-    if (!dst.toFile().exists()) {
-      logger.log(Level.INFO, "Copying {0}", src.toString());
-      Charset charset = StandardCharsets.UTF_8;
-      String content = new String(Files.readAllBytes(src), charset);
-      content = content.replaceAll("weblogic-domain", domainNS);
-      content = content.replaceAll("weblogic-operator", operatorNS);
-      logger.log(Level.INFO, "to {0}", dst.toString());
-      Files.write(dst, content.getBytes(charset));
-    }
-  }
-
   /**
    * call operator to scale to specified number of replicas.
    *

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

@@ -257,7 +257,8 @@ public void testTwoDomainsManagedByOneOperatorSharingPV() throws Exception {
       operator1 = TestUtils.createOperator(OPERATOR1_YAML);
     }
 
-    Domain domain1 = null, domain2 = null;
+    Domain domain1 = null;
+    Domain domain2 = null;
     boolean testCompletedSuccessfully = false;
     try {
       // load input yaml to map and add configOverrides

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

@@ -1,6 +1,7 @@
 // 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 oracle.kubernetes.operator;
 
 import java.nio.file.Files;
@@ -60,9 +61,9 @@ private void setupOperatorAndDomain(String operatorGitRelease, String operatorRe
     operatorMap.put("namespace", OP_NS);
     operatorMap.put("releaseName", OP_DEP_NAME);
     operatorMap.put("serviceAccount", OP_SA);
-    List<String> dom_ns = new ArrayList<String>();
-    dom_ns.add(DOM_NS);
-    operatorMap.put("domainNamespaces", dom_ns);
+    List<String> domNs = new ArrayList<String>();
+    domNs.add(DOM_NS);
+    operatorMap.put("domainNamespaces", domNs);
     operator = TestUtils.createOperator(operatorMap, Operator.RestCertType.LEGACY);
     TestUtils.exec("kubectl get all --all-namespaces", true);
 
@@ -79,7 +80,7 @@ private void setupOperatorAndDomain(String operatorGitRelease, String operatorRe
   }
 
   /**
-   * cleanup the domain and operator after every test
+   * cleanup the domain and operator after every test.
    *
    * @throws Exception when domain and operator cleanup fails
    */
@@ -99,7 +100,7 @@ public void cleanupOperatorAndDomain() throws Exception {
   }
 
   /**
-   * Releases k8s cluster lease, archives result, pv directories
+   * Releases k8s cluster lease, archives result, pv directories.
    *
    * @throws Exception when deleting pv directories or other tearDown tasks fail.
    */
@@ -115,7 +116,7 @@ public static void staticUnPrepare() throws Exception {
   }
 
   /**
-   * Test for upgrading Operator from release 2.0 to develop branch
+   * Test for upgrading Operator from release 2.0 to develop branch.
    *
    * @throws Exception when upgrade fails
    */
@@ -135,7 +136,7 @@ public void testOperatorUpgradeFrom2_0() throws Exception {
   }
 
   /**
-   * Test for upgrading Operator from release 2.0.1 to develop branch
+   * Test for upgrading Operator from release 2.0.1 to develop branch.
    *
    * @throws Exception when upgrade fails
    */
@@ -155,7 +156,7 @@ public void testOperatorUpgradeFrom2_0_1() throws Exception {
   }
 
   /**
-   * Test for upgrading Operator from release 2.1 to develop branch
+   * Test for upgrading Operator from release 2.1 to develop branch.
    *
    * @throws Exception when upgrade fails
    */
@@ -175,7 +176,7 @@ public void testOperatorUpgradeFrom2_1() throws Exception {
   }
 
   /**
-   * Test for upgrading Operator from release 2.2.0 to develop branch
+   * Test for upgrading Operator from release 2.2.0 to develop branch.
    *
    * @throws Exception when upgrade fails
    */
@@ -195,7 +196,7 @@ public void testOperatorUpgradeFrom2_2_0() throws Exception {
   }
 
   /**
-   * Test for upgrading Operator from release 2.2.1 to develop branch
+   * Test for upgrading Operator from release 2.2.1 to develop branch.
    *
    * @throws Exception when upgrade fails
    */
@@ -215,7 +216,7 @@ public void testOperatorUpgradeFrom2_2_1() throws Exception {
   }
 
   /**
-   * Upgrades operator to develop branch by using the helm upgrade
+   * Upgrades operator to develop branch by using the helm upgrade.
    *
    * @param restart boolean parameter used to determine if a restart of domain is checked
    * @throws Exception when upgrade fails or basic usecase testing or scaling fails.
@@ -232,7 +233,7 @@ private void upgradeOperator(boolean restart) throws Exception {
 
   /**
    * checks the expected version of the upgraded operator in a loop. In Jenkins it takes nearly 8
-   * minutes to show the updated value of the domain CRD
+   * minutes to show the updated value of the domain CRD.
    *
    * @throws Exception when version does not match
    */
@@ -260,7 +261,7 @@ private void checkOperatorVersion() throws Exception {
   }
 
   /**
-   * Check whether the weblogic server instances are rolling restarted
+   * Check whether the weblogic server instances are rolling restarted.
    *
    * @throws Exception If restart fails or not restarted
    */