refactor methods out of services into relevant entities

Author: anshooarora

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

@@ -10,7 +10,6 @@
 import com.aventstack.extentreports.model.Media;
 import com.aventstack.extentreports.model.ReportStats;
 import com.aventstack.extentreports.model.SystemEnvInfo;
-import com.aventstack.extentreports.model.service.TestService;
 import com.aventstack.extentreports.observer.ExtentObserver;
 
 /**
@@ -265,7 +264,7 @@ public void removeTest(ExtentTest test) {
      *            The test name
      */
     public void removeTest(String name) {
-        TestService.findTest(getReport().getTestList(), name)
+        getReport().findTest(getReport().getTestList(), name)
                 .ifPresent(this::onTestRemoved);
     }
 

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

@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.aventstack.extentreports.Status;
@@ -73,7 +74,25 @@ public final boolean anyTestHasStatus(Status status) {
         return testList.stream()
                 .anyMatch(x -> x.getStatus() == status);
     }
-
+   
+    public Optional<Test> findTest(List<Test> list, String name) {
+        Optional<Test> test = list.stream().filter(x -> x.getName().equals(name)).findFirst();
+        if (!test.isPresent())
+            for (Test t : list)
+                return findTest(t.getChildren(), name);
+        return test;
+    }
+    
+    public List<ExceptionInfo> aggregateExceptions(List<Test> testList) {
+        List<ExceptionInfo> list = new ArrayList<>();
+        for (Test test : testList) {
+            list.addAll(test.aggregateExceptions());
+            if (!test.getChildren().isEmpty())
+                aggregateExceptions(test.getChildren());
+        }
+        return list;
+    }
+	
     public final long timeTaken() {
         return endTime.getTime() - startTime.getTime();
     }

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

@@ -13,6 +13,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 import com.aventstack.extentreports.Status;
 import com.aventstack.extentreports.gherkin.model.IGherkinFormatterModel;
@@ -168,6 +169,13 @@ public final boolean hasScreenCapture() {
     public final long timeTaken() {
         return endTime.getTime() - startTime.getTime();
     }
+    
+    public List<ExceptionInfo> aggregateExceptions() {
+        return logs.stream()
+                .filter(x -> x.getException() != null)
+                .map(x -> x.getException())
+                .collect(Collectors.toList());
+    }
 
     public final Test getAncestor() {
         Test test = this;

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

@@ -1,32 +1,13 @@
 package com.aventstack.extentreports.model.service;
 
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 import com.aventstack.extentreports.gherkin.model.IGherkinFormatterModel;
-import com.aventstack.extentreports.model.ExceptionInfo;
 import com.aventstack.extentreports.model.Log;
 import com.aventstack.extentreports.model.Test;
 
 public class TestService {
-    public static boolean deleteTest(List<Test> list, Test test) {
-        boolean removed = list.removeIf(x -> x.getId() == test.getId());
-        if (!removed)
-            list.forEach(x -> deleteTest(x.getChildren(), test));
-        return removed;
-    }
-
-    public static Optional<Test> findTest(List<Test> list, String name) {
-        Optional<Test> test = list.stream().filter(x -> x.getName().equals(name)).findFirst();
-        if (!test.isPresent())
-            for (Test t : list)
-                return findTest(t.getChildren(), name);
-        return test;
-    }
-
     public static Boolean testHasScreenCapture(Test test, Boolean deep) {
         if (deep) {
             Boolean hasScreenCapture = !test.getMedia().isEmpty()
@@ -38,23 +19,6 @@ public static Boolean testHasScreenCapture(Test test, Boolean deep) {
         return test.hasScreenCapture();
     }
 
-    public static List<ExceptionInfo> aggregateExceptions(List<Test> testList) {
-        List<ExceptionInfo> list = new ArrayList<>();
-        for (Test test : testList) {
-            list.addAll(aggregateExceptions(test));
-            if (!test.getChildren().isEmpty())
-                aggregateExceptions(test.getChildren());
-        }
-        return list;
-    }
-
-    public static List<ExceptionInfo> aggregateExceptions(Test test) {
-        return test.getLogs().stream()
-                .filter(x -> x.getException() != null)
-                .map(x -> x.getException())
-                .collect(Collectors.toList());
-    }
-
     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");
@@ -72,4 +36,11 @@ public static Test createTest(String name, String description) {
     public static Test createTest(String name) {
         return createTest(name, null);
     }
+    
+    public static boolean deleteTest(List<Test> list, Test test) {
+        boolean removed = list.removeIf(x -> x.getId() == test.getId());
+        if (!removed)
+            list.forEach(x -> deleteTest(x.getChildren(), test));
+        return removed;
+    }
 }

src/test/java/com/aventstack/extentreports/reporter/JsonFormatterBDDTest.java

@@ -1,10 +1,12 @@
 package com.aventstack.extentreports.reporter;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 
 import org.testng.annotations.Test;
 
 import com.aventstack.extentreports.ExtentReports;
+import com.aventstack.extentreports.gherkin.GherkinDialectManager;
 import com.aventstack.extentreports.gherkin.model.Feature;
 import com.aventstack.extentreports.gherkin.model.Given;
 import com.aventstack.extentreports.gherkin.model.Scenario;
@@ -13,8 +15,9 @@ public class JsonFormatterBDDTest {
     private static final String JSON_PATH = "target/extent.json";
 
     @Test
-    public void writeBdd() {
+    public void writeBdd() throws UnsupportedEncodingException {
         ExtentReports extent = new ExtentReports();
+        extent.setGherkinDialect(GherkinDialectManager.getDefaultLanguage());
         JsonFormatter json = new JsonFormatter(JSON_PATH);
         extent.attachReporter(json);
         extent.createTest(Feature.class, "FeatureName")