Resolve CheckStyle issues

oracle · rjeberhard · Feb 26, 2020 · Aug 27, 2019 · Aug 27, 2019 · Aug 28, 2019
commit 51df62e203e73bb93c5eb74d30a8b339edc6e9c8
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java
@@ -89,12 +89,12 @@ public class BaseTest {
         System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true");
 
     // if QUICKTEST is false, run all the tests including QUICKTEST
-    if(!QUICKTEST) {
+    if (!QUICKTEST) {
       FULLTEST = true;
       QUICKTEST = true;
     }
 
-    logger.info("QUICKTEST " + QUICKTEST+ " FULLTEST "+FULLTEST);
+    logger.info("QUICKTEST " + QUICKTEST + " FULLTEST " + FULLTEST);
     if (System.getenv("JENKINS") != null) {
       JENKINS = new Boolean(System.getenv("JENKINS")).booleanValue();
     }

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItManagedCoherence.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItManagedCoherence.java
@@ -72,7 +72,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItOperator.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItOperator.java
@@ -607,7 +607,7 @@ private Domain testAdvancedUseCasesForADomain(Operator operator, Domain domain)
     domain.enablePrecreateService();
     testClusterScaling(operator, domain);
     domain.verifyServicesCreated(true);
-    if(FULLTEST) {
+    if (FULLTEST) {
       testDomainLifecyle(operator, domain);
       testOperatorLifecycle(operator, domain);
     }    

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItOperatorUpgrade.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItOperatorUpgrade.java
@@ -45,10 +45,10 @@ public class ItOperatorUpgrade extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(System.getenv("IMAGE_NAME_OPERATOR") != null && 
-        System.getenv("IMAGE_TAG_OPERATOR") != null) {
-    OP_TARGET_RELEASE = System.getenv("IMAGE_NAME_OPERATOR")+":"+
-                  System.getenv("IMAGE_TAG_OPERATOR");
+    if (System.getenv("IMAGE_NAME_OPERATOR") != null
+        && System.getenv("IMAGE_TAG_OPERATOR") != null) {
+      OP_TARGET_RELEASE = System.getenv("IMAGE_NAME_OPERATOR") + ":"
+        + System.getenv("IMAGE_TAG_OPERATOR");
     }
   }
 
@@ -78,7 +78,7 @@ public void cleanupOperatorAndDomain() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");
@@ -221,7 +221,7 @@ private void upgradeOperator(boolean restart) throws Exception {
     }
     checkOperatorVersion();
     testBasicUseCases(domain);
-    if(FULLTEST) {
+    if (FULLTEST) {
       testClusterScaling(operator, domain);
     }
   }

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItPodTemplates.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItPodTemplates.java
@@ -45,7 +45,7 @@ public class ItPodTemplates extends BaseTest {
   @BeforeClass
   public static void staticPrepare() throws Exception {
     // initialize test properties and create the directories
-    if(QUICKTEST) {
+    if (QUICKTEST) {
       initialize(APP_PROPS_FILE);
     }
   }
@@ -57,7 +57,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(QUICKTEST) {
+    if (QUICKTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItServerDiscovery.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItServerDiscovery.java
@@ -44,7 +44,7 @@ public class ItServerDiscovery extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       // initialize test properties and create the directories
       initialize(APP_PROPS_FILE);
 
@@ -90,7 +90,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       logger.info("++++++++++++++++++++++++++++++++++");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItSessionMigration.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItSessionMigration.java
@@ -47,7 +47,7 @@ public class ItSessionMigration extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       // initialize test properties and create the directories
       initialize(APP_PROPS_FILE);
 
@@ -91,7 +91,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       logger.info("++++++++++++++++++++++++++++++++++");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItSitConfigDomainInImage.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItSitConfigDomainInImage.java
@@ -24,7 +24,7 @@ public class ItSitConfigDomainInImage extends SitConfig {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       SitConfig.staticPrepare(
           DOMAININIMAGE_WLST_YAML,
           "integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config-inimage.py");
@@ -38,7 +38,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       SitConfig.staticUnPrepare();
     }
   }

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItSitConfigDomainInPV.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItSitConfigDomainInPV.java
@@ -24,7 +24,7 @@ public class ItSitConfigDomainInPV extends SitConfig {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       SitConfig.staticPrepare(
           DOMAINONPV_WLST_YAML,
           "integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config20.py");
@@ -38,7 +38,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       SitConfig.staticUnPrepare();
     }
   }

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItStickySession.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItStickySession.java
@@ -49,7 +49,7 @@ public class ItStickySession extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       // initialize test properties and create the directories
       initialize(APP_PROPS_FILE);
 
@@ -95,7 +95,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItUsabilityOperatorHelmChart.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItUsabilityOperatorHelmChart.java
@@ -42,10 +42,10 @@ public class ItUsabilityOperatorHelmChart extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-      if(QUICKTEST) {
+    if (QUICKTEST) {
       // initialize test properties and create the directories
       initialize(APP_PROPS_FILE);    
-      }
+    }
   }
 
   /**
@@ -55,7 +55,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(QUICKTEST) {
+    if (QUICKTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/JrfInOperatorAdvancedTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/JrfInOperatorAdvancedTest.java
@@ -49,7 +49,7 @@ public class JrfInOperatorAdvancedTest extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       // initialize test properties and create the directories
       initialize(APP_PROPS_FILE);
 
@@ -76,7 +76,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/JrfInOperatorTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/JrfInOperatorTest.java
@@ -50,7 +50,7 @@ public class JrfInOperatorTest extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       // initialize test properties and create the directories
       initialize(APP_PROPS_FILE);
 
@@ -77,7 +77,7 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    if(FULLTEST) {
+    if (FULLTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java
@@ -500,8 +500,8 @@ private void initialize(
     }
     // customize the inputs yaml file to generate a self-signed cert for the external Operator REST
     // https port
-    externalRestEnabled = operatorMap.containsKey("externalRestEnabled") ? 
-        (new Boolean((operatorMap.get("externalRestEnabled")).toString()).booleanValue() ): externalRestEnabled;
+    externalRestEnabled = operatorMap.containsKey("externalRestEnabled")
+        ? (new Boolean((operatorMap.get("externalRestEnabled")).toString()).booleanValue()) : externalRestEnabled;
     if (externalRestEnabled) {
       if (operatorMap.get("externalRestHttpsPort") != null) {
         try {

diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/PersistentVolume.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/PersistentVolume.java
@@ -30,10 +30,11 @@ public PersistentVolume(String dirPath, Map pvMap) throws Exception {
         + "'"; 
 
     // retry logic for PV dir creation as sometimes krun.sh fails
-    int cnt = 0, maxCnt = 10;
-    while(cnt < maxCnt) {
-      logger.info("Executing command "+cmd);
-      if(ExecCommand.exec(cmd).exitValue() ==0) {
+    int cnt = 0;
+    int maxCnt = 10;
+    while (cnt < maxCnt) {
+      logger.info("Executing command " + cmd);
+      if (ExecCommand.exec(cmd).exitValue() == 0) {
         break;
       } else {
         logger.info("PV dir creation command failed");