update getOrDefault

wz2cool · May 19, 2024 · 0f68c7b · 0f68c7b
1 parent 09940e7
commit 0f68c7b
Show file tree

Hide file tree

Showing 5 changed files with 9,257 additions and 6 deletions.
diff --git a/.scannerwork/.sonar_lock b/.scannerwork/.sonar_lock
diff --git a/package.json b/package.json
@@ -58,7 +58,6 @@
     "karma-firefox-launcher": "^1.1.0",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-phantomjs-launcher": "^1.0.4",
     "merge-stream": "^1.0.1",
     "mocha": "~5.2.0",
     "mocha-lcov-reporter": "~1.3.0",

diff --git a/src/utils/object.utils.ts b/src/utils/object.utils.ts
@@ -284,13 +284,32 @@ export class ObjectUtils {
    * @example ObjectUtils.getOrDefault<number | undefined>(undefined, 0)    = "0"
    * @example ObjectUtils.getOrDefault<number | null>(1, 0)                 = "1"
    * @example ObjectUtils.getOrDefault<number | null>(null, 0)              = "0"
+   * @example ObjectUtils.getOrDefault(number | null>)(1, 2, 3)             = "1"
+   * @example ObjectUtils.getOrDefault(number | null>)(null, 2, 3)          = "2" 
+   * @example ObjectUtils.getOrDefault(number | null>)(null, null, 3)       = "3"
+   * @example ObjectUtils.getOrDefault(number | null>)(null, null, null)   = null
+   * @example ObjectUtils.getOrDefault(number | null>)(null, null, null, 3) = "3"
    */
-  public static getOrDefault<T>(value: T, defaultValue: NonNullable<T>): NonNullable<T> {
-    if (ObjectUtils.isNullOrUndefined(value)) {
-      return defaultValue;
-    } else {
-      return value as NonNullable<T>;
+  public static getOrDefault<T>(value1: T, defaultValue: T): T;
+  public static getOrDefault<T>(value1: T, value2: T, defaultValue: T): T;
+  public static getOrDefault<T>(value1: T, value2: T, value3: T, defaultValue: T): T;
+  public static getOrDefault<T>(
+    value1: T,
+    value2: T,
+    value3: T,
+    defaultValue: T
+  ): T
+  public static getOrDefault<T>(value1: T, value2?: T, value3?: T, defaultValue?: T): T {
+    if (!ObjectUtils.isNullOrUndefined(value1)) {
+      return value1 as NonNullable<T>;
+    }
+    if (!ObjectUtils.isNullOrUndefined(value2)) {
+      return value2 as NonNullable<T>;
+    }
+    if (!ObjectUtils.isNullOrUndefined(value3)) {
+      return value3 as NonNullable<T>;
     }
+    return defaultValue;
   }
 
   /**

diff --git a/test/utils/object.utils.test.ts b/test/utils/object.utils.test.ts
@@ -301,6 +301,42 @@ describe(".ObjectUtils", () => {
   });
 
   describe("#getOrDefault", () => {
+    it("should return 1, if value1 is not null", () => {
+      const value1: string | undefined = "1";
+      const value2: string | undefined = "2";
+      const result = ObjectUtils.getOrDefault(value1, value2, "defaultValue");
+      expect("1").to.be.eq(result);
+    });
+
+    it("should return 2, if  value2 is not null and value1 is null", () => {
+      const value1: string | undefined = undefined;
+      const value2: string | undefined = "2";
+      const result = ObjectUtils.getOrDefault(value1, value2, "defaultValue");
+      expect("2").to.be.eq(result);
+    });
+
+    it("should return 'defaultValue', if all values is null", () => {
+      const value1: string | undefined = undefined;
+      const value2: string | undefined = undefined;
+      const result = ObjectUtils.getOrDefault(value1, value2, "defaultValue");
+      expect("defaultValue").to.be.eq(result);
+    })
+
+    it("should return 'defaultValue', if all values is null", () => {
+      const value1: string | undefined = undefined;
+      const value2: string | undefined = undefined;
+      const value3: string | undefined = undefined;
+      const result = ObjectUtils.getOrDefault(value1, value2, value3, "defaultValue");
+      expect("defaultValue").to.be.eq(result);
+    })
+
+    it("should return '', if first value is not null", () => {
+      const value1: string | undefined = undefined;
+      const value2: string | undefined = "2";
+      const result = ObjectUtils.getOrDefault(value1, value2, "defaultValue");
+      expect("2").to.be.eq(result);
+    });
+
     it("should return  [1,2,3] if value is not null or empty", () => {
       const target = [1, 2, 3];
       const value: number[] | undefined = target;