From 2c4c68fff728a2fa7d7a172b48ffbc8aac44f4eb Mon Sep 17 00:00:00 2001
From: Chris Laprun <metacosm@gmail.com>
Date: Wed, 9 Mar 2022 23:08:09 +0100
Subject: [PATCH] fix: debugThreadPool & shouldCheckCRDAndValidateLocalModel
 should work

Fixes #1014
---
 .../operator/api/config/Utils.java            | 21 +++++-
 .../operator/api/config/UtilsTest.java        | 64 +++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/Utils.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/Utils.java
index b36c0468cd..06bbcaa7a8 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/Utils.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/Utils.java
@@ -61,10 +61,27 @@ public static boolean isValidateCustomResourcesEnvVarSet() {
   }
 
   public static boolean shouldCheckCRDAndValidateLocalModel() {
-    return Boolean.getBoolean(System.getProperty(CHECK_CRD_ENV_KEY, "true"));
+    return getBooleanFromSystemPropsOrDefault(CHECK_CRD_ENV_KEY, true);
   }
 
   public static boolean debugThreadPool() {
-    return Boolean.getBoolean(System.getProperty(DEBUG_THREAD_POOL_ENV_KEY, "false"));
+    return getBooleanFromSystemPropsOrDefault(DEBUG_THREAD_POOL_ENV_KEY, false);
+  }
+
+  static boolean getBooleanFromSystemPropsOrDefault(String propertyName, boolean defaultValue) {
+    var property = System.getProperty(propertyName);
+    if (property == null) {
+      return defaultValue;
+    } else {
+      property = property.trim().toLowerCase();
+      switch (property) {
+        case "true":
+          return true;
+        case "false":
+          return false;
+        default:
+          return defaultValue;
+      }
+    }
   }
 }
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java
new file mode 100644
index 0000000000..a17eb1ba59
--- /dev/null
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java
@@ -0,0 +1,64 @@
+package io.javaoperatorsdk.operator.api.config;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class UtilsTest {
+
+  @Test
+  void shouldCheckCRDAndValidateLocalModelByDefault() {
+    assertTrue(Utils.shouldCheckCRDAndValidateLocalModel());
+  }
+
+  @Test
+  void shouldNotDebugThreadPoolByDefault() {
+    assertFalse(Utils.debugThreadPool());
+  }
+
+  @Test
+  void askingForNonexistentPropertyShouldReturnDefault() {
+    final var key = "foo";
+    assertNull(System.getProperty(key));
+    assertFalse(Utils.getBooleanFromSystemPropsOrDefault(key, false));
+    assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, true));
+  }
+
+  @Test
+  void askingForExistingPropertyShouldReturnItIfBoolean() {
+    final var key = "foo";
+    try {
+      System.setProperty(key, "true");
+      assertNotNull(System.getProperty(key));
+      assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, false));
+      assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, true));
+
+      System.setProperty(key, "TruE");
+      assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, false));
+      assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, true));
+
+      System.setProperty(key, " \tTRUE  ");
+      assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, false));
+      assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, true));
+
+      System.setProperty(key, " \nFalSe \t ");
+      assertFalse(Utils.getBooleanFromSystemPropsOrDefault(key, false));
+      assertFalse(Utils.getBooleanFromSystemPropsOrDefault(key, true));
+    } finally {
+      System.clearProperty(key);
+    }
+  }
+
+  @Test
+  void askingForExistingNonBooleanPropertyShouldReturnDefaultValue() {
+    final var key = "foo";
+    try {
+      System.setProperty(key, "bar");
+      assertNotNull(System.getProperty(key));
+      assertFalse(Utils.getBooleanFromSystemPropsOrDefault(key, false));
+      assertTrue(Utils.getBooleanFromSystemPropsOrDefault(key, true));
+    } finally {
+      System.clearProperty(key);
+    }
+  }
+}