refactoring asserts

Author: anshooarora

src/main/java/com/aventstack/extentreports/ExtentTest.java

@@ -16,6 +16,7 @@
 import com.aventstack.extentreports.model.ScreenCapture;
 import com.aventstack.extentreports.model.Test;
 import com.aventstack.extentreports.model.service.ExceptionInfoService;
+import com.aventstack.extentreports.util.Assert;
 
 import lombok.Getter;
 
@@ -92,8 +93,7 @@ public class ExtentTest implements RunResult, Serializable {
      *            Test description
      */
     ExtentTest(ExtentReports extent, Class<? extends IGherkinFormatterModel> type, String name, String description) {
-        if (name == null || name.isEmpty())
-            throw new IllegalArgumentException("Test name cannot be null or empty");
+        Assert.notEmpty(name, "Test name must not be null or empty");
         model = Test.builder()
                 .bddType(type)
                 .name(name)
@@ -357,8 +357,7 @@ public ExtentTest generateLog(Status status, Markup markup) {
      * @return An {@link ExtentTest} object
      */
     public ExtentTest log(Status status, String details, Throwable t, Media media) {
-        if (status == null)
-            throw new IllegalArgumentException("Status must not be null");
+    	Assert.notNull(status, "Status must not be null");
         Log log = Log.builder()
                 .status(status)
                 .details(details == null ? "" : details)
@@ -1068,8 +1067,7 @@ public Status getStatus() {
     }
 
     public ExtentTest addScreenCaptureFromPath(String path, String title) {
-        if (path == null || path.isEmpty())
-            throw new IllegalArgumentException("ScreenCapture path cannot be null or empty");
+    	Assert.notEmpty(path, "ScreenCapture path must not be null or empty");
         Media m = ScreenCapture.builder().path(path).title(title).build();
         model.addMedia(m);
         extent.onMediaAdded(m, model);
@@ -1081,8 +1079,7 @@ public ExtentTest addScreenCaptureFromPath(String path) {
     }
 
     public ExtentTest addScreenCaptureFromBase64String(String base64, String title) {
-        if (base64 == null || base64.isEmpty())
-            throw new IllegalArgumentException("Base64 string cannot be null or empty");
+    	Assert.notEmpty(base64, "ScreenCapture's base64 string must not be null or empty");
         if (!base64.startsWith("data:"))
             base64 = "data:image/png;base64," + base64;
         Media m = ScreenCapture.builder().base64(base64).title(title).build();

src/main/java/com/aventstack/extentreports/MediaEntityBuilder.java

@@ -2,6 +2,7 @@
 
 import com.aventstack.extentreports.model.Media;
 import com.aventstack.extentreports.model.ScreenCapture;
+import com.aventstack.extentreports.util.Assert;
 
 /**
  * Media builder for base64 and binary screenshots
@@ -30,8 +31,7 @@ public Media build() {
     }
 
     public static MediaEntityBuilder createScreenCaptureFromPath(String path, String title) {
-        if (path == null || path.isEmpty())
-            throw new IllegalArgumentException("ScreenCapture path cannot be null or empty");
+    	Assert.notEmpty(path, "ScreenCapture path must not be null or empty");
         media.set(ScreenCapture.builder().path(path).title(title).build());
         return getInstance();
     }
@@ -41,8 +41,7 @@ public static MediaEntityBuilder createScreenCaptureFromPath(String path) {
     }
 
     public static MediaEntityBuilder createScreenCaptureFromBase64String(String base64, String title) {
-        if (base64 == null || base64.trim().equals(""))
-            throw new IllegalArgumentException("Base64 string cannot be null or empty");
+    	Assert.notEmpty(base64, "ScreenCapture's base64 string must not be null or empty");
         if (!base64.startsWith("data:"))
             base64 = BASE64_ENCODED + base64;
         media.set(ScreenCapture.builder().base64(base64).title(title).build());

src/main/java/com/aventstack/extentreports/config/external/JsonConfigLoader.java

@@ -6,6 +6,7 @@
 import java.lang.reflect.Type;
 import java.nio.file.Files;
 
+import com.aventstack.extentreports.util.Assert;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.InstanceCreator;
@@ -17,17 +18,15 @@ public class JsonConfigLoader<T> implements ConfigLoadable<T> {
     private InstanceCreator<T> creator;
 
     public JsonConfigLoader(T instance, File f) throws FileNotFoundException {
-        if (f == null)
-            throw new IllegalArgumentException("File cannot be null");
+    	Assert.notNull(f, "File must not be null");
         if (!f.exists())
             throw new FileNotFoundException("File " + f.getAbsolutePath() + " could not be found");
         init(instance);
         this.f = f;
     }
 
     public JsonConfigLoader(T instance, String json) {
-        if (json == null || json.isEmpty())
-            throw new IllegalArgumentException("Json input cannot be null or empty");
+    	Assert.notEmpty(json, "Json input must not be null or empty");
         init(instance);
         this.json = json;
     }

src/main/java/com/aventstack/extentreports/model/Test.java

@@ -19,6 +19,7 @@
 import com.aventstack.extentreports.gherkin.model.IGherkinFormatterModel;
 import com.aventstack.extentreports.gherkin.model.Scenario;
 import com.aventstack.extentreports.gherkin.model.ScenarioOutline;
+import com.aventstack.extentreports.util.Assert;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -64,8 +65,7 @@ public final class Test implements RunResult, Serializable, BaseEntity, MetaData
     private final List<Log> generatedLog = Collections.synchronizedList(new ArrayList<>());
 
     public final void addChild(Test child) {
-        if (child == null)
-            throw new IllegalArgumentException("Node must not be null");
+    	Assert.notNull(child, "Node must not be null");
         child.setLevel(level + 1);
         child.setParent(this);
         child.setLeaf(true);
@@ -100,8 +100,7 @@ public final void addGeneratedLog(Log log) {
     }
 
     private final void addLog(Log log, List<Log> list) {
-        if (log == null)
-            throw new IllegalArgumentException("Log must not be null");
+    	Assert.notNull(log, "Log must not be null");
         log.setSeq(list.size());
         list.add(log);
         end(log.getStatus());

src/main/java/com/aventstack/extentreports/model/context/NamedAttributeContext.java

@@ -10,6 +10,7 @@
 import com.aventstack.extentreports.Status;
 import com.aventstack.extentreports.model.NamedAttribute;
 import com.aventstack.extentreports.model.Test;
+import com.aventstack.extentreports.util.Assert;
 
 import lombok.Getter;
 import lombok.ToString;
@@ -29,8 +30,7 @@ public NamedAttributeContext(T attribute, Test test) {
     }
 
     public void addTest(Test test) {
-        if (test == null)
-            throw new IllegalArgumentException("Test cannot be null");
+    	Assert.notNull(test, "Test must not be null");
         testList.add(test);
         refresh(test);
     }

src/main/java/com/aventstack/extentreports/model/service/TestService.java

@@ -6,6 +6,7 @@
 import com.aventstack.extentreports.gherkin.model.IGherkinFormatterModel;
 import com.aventstack.extentreports.model.Log;
 import com.aventstack.extentreports.model.Test;
+import com.aventstack.extentreports.util.Assert;
 
 public class TestService {
     public static Boolean testHasScreenCapture(Test test, Boolean deep) {
@@ -20,8 +21,7 @@ public static Boolean testHasScreenCapture(Test test, Boolean deep) {
     }
 
     public static Test createTest(Class<? extends IGherkinFormatterModel> type, String name, String description) {
-        if (name == null || name.isEmpty())
-            throw new IllegalArgumentException("Test name cannot be null or empty");
+    	Assert.notEmpty(name, "Test name must not be null or empty");
         return Test.builder()
                 .bddType(type)
                 .name(name)

src/main/java/com/aventstack/extentreports/util/Assert.java

@@ -0,0 +1,15 @@
+package com.aventstack.extentreports.util;
+
+public class Assert {
+	public static void notNull(Object o, String message) {
+		if (o == null) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+	
+	public static void notEmpty(String s, String message) {
+		if (s == null || s.isEmpty()) {
+			throw new IllegalArgumentException(message);
+		}
+	}
+}