#173, #176 refactoring

Combined usage:

ExtentSparkReporter spark = new ExtentSparkReporter("spark.html")
            .filter()
                .statusFilter()
                .as(new Status[] { Status.SKIP, Status.FAIL })
            .apply()
            .viewConfigurer()
                .viewOrder()
                .as(new ViewName[] { ViewName.DASHBOARD })
            .apply();

Author: anshooarora

Readme.md

@@ -45,9 +45,10 @@ It is now possible to create separate reports for each status (or a group of the
 ExtentReports extent = new ExtentReports();
 // will only contain failures
 ExtentSparkReporter sparkFail = new ExtentSparkReporter("target/spark/fail.html")
-  .with()
-    .statusFilter().as(new Status[] {Status.FAIL})
-  .<ExtentSparkReporter>build();
+  .filter()
+    .statusFilter()
+    .as(new Status[] { Status.FAIL })
+  .apply()
 // will contain all tests
 ExtentSparkReporter sparkAll = new ExtentSparkReporter("spark/all.html");
 extent.attachReporter(sparkFail, sparkAll);
@@ -60,9 +61,10 @@ to be the primary view, followed by Tests, you can use the snippet below:
 ```java
 ExtentReports extent = new ExtentReports();
 ExtentSparkReporter spark = new ExtentSparkReporter("spark/spark.html")
-  .with()
-    .viewOrder().as(new ViewName[] { ViewName.DASHBOARD, ViewName.TEST })
-  .<ExtentSparkReporter>build();
+  .viewConfigurer()
+    .viewOrder()
+    .as(new ViewName[] { ViewName.DASHBOARD, ViewName.TEST })
+  .apply();
 ```
 
 The above will limit the report to 2 views, with DASHBOARD view the primary one, followed by TEST. 

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

@@ -1,5 +1,6 @@
 package com.aventstack.extentreports.model.service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -17,13 +18,14 @@ public class ReportStatsService {
 
     public static void refreshReportStats(final ReportStats stats,
             final List<Test> testList) {
+        resetReportStats(stats);
         if (testList == null || testList.isEmpty())
             return;
 
-        resetReportStats(stats);
         refreshReportStats(stats, testList, stats.getParent(), stats.getParentPercentage());
 
-        // level 1, for BDD, this would also include Scenario and excludes ScenarioOutline
+        // level 1, for BDD, this would also include Scenario and excludes
+        // ScenarioOutline
         List<Test> children = testList.stream()
                 .flatMap(x -> x.getChildren().stream())
                 .filter(x -> x.getBddType() != ScenarioOutline.class)
@@ -63,26 +65,29 @@ public static void refreshReportStats(final ReportStats stats,
     private static void refreshReportStats(final ReportStats stats,
             final List<? extends RunResult> list, final Map<Status, Long> countMap,
             final Map<Status, Float> percentageMap) {
-        if (list == null || list.isEmpty())
+        if (list == null)
             return;
         Map<Status, Long> map = list.stream().collect(
                 Collectors.groupingBy(RunResult::getStatus, Collectors.counting()));
         Arrays.asList(Status.values()).forEach(x -> map.putIfAbsent(x, 0L));
+        countMap.putAll(map);
+        if (list.isEmpty()) {
+            percentageMap.putAll(
+                    map.entrySet().stream()
+                            .collect(Collectors.toMap(e -> e.getKey(), e -> Float.valueOf(e.getValue()))));
+            return;
+        }
         Map<Status, Float> pctMap = map.entrySet().stream()
                 .collect(Collectors.toMap(e -> e.getKey(),
                         e -> Float.valueOf(e.getValue() * 100 / list.size())));
-        countMap.putAll(map);
         percentageMap.putAll(pctMap);
     }
 
     public static void resetReportStats(final ReportStats stats) {
-        stats.getChild().clear();
-        stats.getChildPercentage().clear();
-        stats.getGrandchild().clear();
-        stats.getGrandchildPercentage().clear();
-        stats.getLog().clear();
-        stats.getLogPercentage().clear();
-        stats.getParent().clear();
-        stats.getParentPercentage().clear();
+        List<RunResult> list = new ArrayList<>();
+        refreshReportStats(stats, list, stats.getParent(), stats.getParentPercentage());
+        refreshReportStats(stats, list, stats.getChild(), stats.getChildPercentage());
+        refreshReportStats(stats, list, stats.getGrandchild(), stats.getGrandchildPercentage());
+        refreshReportStats(stats, list, stats.getLog(), stats.getLogPercentage());
     }
 }

src/main/java/com/aventstack/extentreports/reporter/ExtentSparkReporter.java

@@ -13,21 +13,28 @@
 import com.aventstack.extentreports.model.Report;
 import com.aventstack.extentreports.observer.ReportObserver;
 import com.aventstack.extentreports.observer.entity.ReportEntity;
+import com.aventstack.extentreports.reporter.configuration.EntityFilters;
 import com.aventstack.extentreports.reporter.configuration.ExtentSparkReporterConfig;
-import com.aventstack.extentreports.reporter.configuration.FileReporterConfigurer;
-import com.aventstack.extentreports.reporter.configuration.InteractiveReporterConfig;
+import com.aventstack.extentreports.reporter.configuration.ViewConfigurer;
 import com.aventstack.extentreports.reporter.configuration.ViewName;
+import com.aventstack.extentreports.reporter.configuration.ViewsConfigurable;
 import com.google.gson.Gson;
 
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
+import lombok.AccessLevel;
 import lombok.Getter;
 
 @Getter
 @SuppressWarnings("rawtypes")
-public class ExtentSparkReporter extends AbstractFileReporter implements ReportObserver, ReporterConfigurable {
+public class ExtentSparkReporter extends AbstractFileReporter
+        implements
+            ReportObserver,
+            ReporterConfigurable,
+            ViewsConfigurable<ExtentSparkReporter>,
+            ReporterFilterable {
     private static final Logger logger = Logger.getLogger(ExtentSparkReporter.class.getName());
     private static final String TEMPLATE_LOCATION = "templates/";
     private static final String ENCODING = "UTF-8";
@@ -38,7 +45,11 @@ public class ExtentSparkReporter extends AbstractFileReporter implements ReportO
             ViewName.CATEGORY, ViewName.DASHBOARD, ViewName.EXCEPTION, ViewName.TEST, ViewName.LOG
     });
 
-    private FileReporterConfigurer<ExtentSparkReporter> configurer = new FileReporterConfigurer<>(this);
+    @Getter(value = AccessLevel.NONE)
+    private final ViewConfigurer<ExtentSparkReporter> viewConfigurer = new ViewConfigurer<>(this);
+    @Getter(value = AccessLevel.NONE)
+    private final EntityFilters<ExtentSparkReporter> filter = new EntityFilters<>(this);
+
     private ExtentSparkReporterConfig conf = ExtentSparkReporterConfig.builder().build();
     private Disposable disposable;
     private List<ViewName> viewNames = SUPPORTED_VIEWS;
@@ -51,11 +62,17 @@ public ExtentSparkReporter(File f) {
         super(f);
     }
 
-    public FileReporterConfigurer with() {
-        return configurer;
+    @Override
+    public EntityFilters<ExtentSparkReporter> filter() {
+        return filter;
+    }
+
+    @Override
+    public ViewConfigurer<ExtentSparkReporter> viewConfigurer() {
+        return viewConfigurer;
     }
 
-    public InteractiveReporterConfig config() {
+    public ExtentSparkReporterConfig config() {
         return conf;
     }
 
@@ -122,10 +139,10 @@ private void start(Disposable d) {
     }
 
     private void flush(ReportEntity value) {
-        final Report report = filterAndGet(value.getReport(), configurer.getStatusFilter().getStatus());
+        final Report report = filterAndGet(value.getReport(), filter.statusFilter().getStatus());
         try {
             getTemplateModel().put("this", this);
-            getTemplateModel().put("viewOrder", configurer.getViewOrder().getViewOrder());
+            getTemplateModel().put("viewOrder", viewConfigurer.viewOrder().getViewOrder());
             getTemplateModel().put("report", report);
             createFreemarkerConfig(TEMPLATE_LOCATION, ENCODING);
             final String filePath = getFile().isDirectory()

src/main/java/com/aventstack/extentreports/reporter/ReporterFilterable.java

@@ -0,0 +1,8 @@
+package com.aventstack.extentreports.reporter;
+
+import com.aventstack.extentreports.reporter.configuration.EntityFilters;
+
+@FunctionalInterface
+public interface ReporterFilterable<T extends AbstractReporter> {
+    EntityFilters<T> filter();
+}

src/main/java/com/aventstack/extentreports/reporter/configuration/EntityFilters.java

@@ -0,0 +1,22 @@
+package com.aventstack.extentreports.reporter.configuration;
+
+import com.aventstack.extentreports.reporter.AbstractReporter;
+
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class EntityFilters<T extends AbstractReporter> {
+    private final T reporter;
+    private final StatusFilter<T> statusFilter;
+
+    public EntityFilters(T reporter) {
+        this.reporter = reporter;
+        statusFilter = new StatusFilter<T>(this);
+    }
+
+    public T apply() {
+        return reporter;
+    }
+}

src/main/java/com/aventstack/extentreports/reporter/configuration/FileReporterConfig.java

@@ -7,7 +7,7 @@
 
 @Getter
 @Setter
-@SuperBuilder
+@SuperBuilder(builderMethodName = "with")
 public abstract class FileReporterConfig extends AbstractConfiguration {
     @Builder.Default
     private String encoding = "UTF-8";

src/main/java/com/aventstack/extentreports/reporter/configuration/FileReporterConfigurer.java

@@ -11,25 +11,25 @@
 import lombok.Getter;
 
 @Getter
-public class StatusFilter {
+public class StatusFilter<T extends AbstractReporter> {
     private Set<Status> status = new HashSet<>(Arrays.asList(Status.values()));
-    private FileReporterConfigurer<?> configurer;
+    private EntityFilters<?> configurer;
 
-    public <T extends AbstractReporter> StatusFilter(FileReporterConfigurer<T> configurer) {
+    public StatusFilter(EntityFilters<T> configurer) {
         this.configurer = configurer;
     }
 
     @SuppressWarnings("unchecked")
-    public <T extends AbstractReporter> FileReporterConfigurer<T> as(Set<Status> status) {
+    public EntityFilters<T> as(Set<Status> status) {
         this.status = status;
-        return (FileReporterConfigurer<T>) configurer.configure(this);
+        return (EntityFilters<T>) configurer;
     }
 
-    public <T extends AbstractReporter> FileReporterConfigurer<T> as(List<Status> status) {
+    public EntityFilters<T> as(List<Status> status) {
         return as(new HashSet<>(status));
     }
 
-    public <T extends AbstractReporter> FileReporterConfigurer<T> as(Status[] status) {
+    public EntityFilters<T> as(Status[] status) {
         return as(Arrays.asList(status));
     }
 }

src/main/java/com/aventstack/extentreports/reporter/configuration/StatusFilter.java

@@ -0,0 +1,20 @@
+package com.aventstack.extentreports.reporter.configuration;
+
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class ViewConfigurer<T extends ViewsConfigurable<T>> {
+    private final T reporter;
+    private final ViewOrder<T> viewOrder;
+
+    public ViewConfigurer(T reporter) {
+        this.reporter = reporter;
+        viewOrder = new ViewOrder<T>(this);
+    }
+
+    public T apply() {
+        return reporter;
+    }
+}

src/main/java/com/aventstack/extentreports/reporter/configuration/ViewConfigurer.java

@@ -3,14 +3,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.aventstack.extentreports.reporter.AbstractReporter;
-
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor
-public class ViewOrder {
+public class ViewOrder<T extends ViewsConfigurable<T>> {
     private static final List<ViewName> DEFAULT_ORDER = Arrays.asList(new ViewName[]{
             ViewName.TEST,
             ViewName.EXCEPTION,
@@ -22,19 +20,19 @@ public class ViewOrder {
     });
 
     private List<ViewName> viewOrder = DEFAULT_ORDER;
-    private FileReporterConfigurer<?> configurer;
+    private ViewConfigurer<?> configurer;
 
-    public <T extends AbstractReporter> ViewOrder(FileReporterConfigurer<T> configurer) {
+    public ViewOrder(ViewConfigurer<T> configurer) {
         this.configurer = configurer;
     }
 
     @SuppressWarnings("unchecked")
-    public <T extends AbstractReporter> FileReporterConfigurer<T> as(List<ViewName> order) {
+    public ViewConfigurer<T> as(List<ViewName> order) {
         this.viewOrder = order;
-        return (FileReporterConfigurer<T>) configurer.configure(this);
+        return (ViewConfigurer<T>) configurer;
     }
 
-    public <T extends AbstractReporter> FileReporterConfigurer<T> as(ViewName[] viewOrder) {
+    public ViewConfigurer<T> as(ViewName[] viewOrder) {
         return as(Arrays.asList(viewOrder));
     }
 }

src/main/java/com/aventstack/extentreports/reporter/configuration/ViewOrder.java

@@ -0,0 +1,5 @@
+package com.aventstack.extentreports.reporter.configuration;
+
+public interface ViewsConfigurable<T> {
+    ViewConfigurer<?> viewConfigurer();
+}

src/main/java/com/aventstack/extentreports/reporter/configuration/ViewsConfigurable.java

@@ -205,10 +205,12 @@
 <script>
   var statusGroup = {
     parentCount: ${ report.stats.parent?size?c },
+    <#if report.stats.parent?size != 0>
     passParent: ${ report.stats.parent?api.get(Status.PASS)?c },
     failParent: ${ report.stats.parent?api.get(Status.FAIL)?c },
     warningParent: ${ report.stats.parent?api.get(Status.WARNING)?c },
     skipParent: ${ report.stats.parent?api.get(Status.SKIP)?c },
+    </#if>
     childCount: ${ report.stats.child?size?c },
     <#if report.stats.child?size != 0>
     passChild: ${ report.stats.child?api.get(Status.PASS)?c },