chore: sonar issues

Author: fugerit79

src/main/java/org/fugerit/java/junit5/tag/check/facade/DocHelper.java

@@ -18,10 +18,10 @@ public class DocHelper {
       * 
       * Consider using a @ApplicationScoped or Singleton approach.
       */
-     private static final FreemarkerDocProcessConfig docProcessConfig = FreemarkerDocProcessConfigFacade
+     private final FreemarkerDocProcessConfig docProcessConfig = FreemarkerDocProcessConfigFacade
             .loadConfigSafe("cl://junit5-tag-check-maven-plugin/fm-doc-process-config.xml");
 
-     public static void generateReport(String handlerId, ReportHelper reportHelper, OutputStream os ) {
+     public void generateReport(String handlerId, ReportHelper reportHelper, OutputStream os ) {
           SafeFunction.apply( () -> docProcessConfig.
                   fullProcess( "report",
                           DocProcessContext.newContext( "report", reportHelper )

src/main/java/org/fugerit/java/junit5/tag/check/facade/TagReportFacade.java

@@ -55,12 +55,14 @@ private void generateReport(Map<ExecutedTest, Set<String>> testTagMap)
                 generateFjDocReport( helper, format.toLowerCase() );
                 break;
             default:
-                generateTextReport(testTagMap);
+                generateTextReport(helper);
         }
     }
 
-    private void generateTextReport(Map<ExecutedTest, Set<String>> testTagMap)
-            throws IOException {
+    private void generateTextReport(ReportHelper helper) throws IOException {
+
+        Map<ExecutedTest, Set<String>> testTagMap = helper.getTestTagMap();
+
         // Helper method for String.repeat(80)
         String separator = repeatString("=", 80);
         String line = repeatString("-", 80);
@@ -94,21 +96,8 @@ private void generateTextReport(Map<ExecutedTest, Set<String>> testTagMap)
             writer.write("\n");
 
             // Summary by tag (Java 8 compatible map operations: computeIfAbsent is fine)
-            Map<String, List<ExecutedTest>> tagToTests = new HashMap<>();
-            Map<String, TestStats> tagStats = new HashMap<>();
-
-            for (Map.Entry<ExecutedTest, Set<String>> entry : testTagMap.entrySet()) {
-                ExecutedTest test = entry.getKey();
-                for (String tag : entry.getValue()) {
-                    tagToTests.computeIfAbsent(tag, k -> new ArrayList<>()).add(test);
-
-                    TestStats stats = tagStats.computeIfAbsent(tag, k -> new TestStats());
-                    stats.increaseTotal();
-                    if (test.isFailed()) stats.increaseFailed();
-                    if (test.isError()) stats.increaseErrors();
-                    if (test.isSkipped()) stats.increaseSkipped();
-                }
-            }
+            Map<String, List<ExecutedTest>> tagToTests = helper.getTagsToTests();
+            Map<String, TestStats> tagStats = helper.getTagsStats();
 
             writer.write("SUMMARY BY TAG:\n");
             writer.write(line + "\n");
@@ -193,7 +182,7 @@ private String repeatString(String s, int count) {
 
     private void generateFjDocReport(ReportHelper reportHelper, String handlerId) throws IOException {
         try (OutputStream os = new FileOutputStream(outputFile)) {
-            DocHelper.generateReport( handlerId, reportHelper, os );
+            new DocHelper().generateReport( handlerId, reportHelper, os );
         }
     }
 

src/main/java/org/fugerit/java/junit5/tag/check/model/ExecutedTest.java

@@ -1,19 +1,5 @@
 package org.fugerit.java.junit5.tag.check.model;
 
-/*
-
-    {
-      "class": "test.org.fugerit.java.demo.unittestdemoapp.DocResourceSicurezzaTest",
-      "method": "testHtmlOkNoAdminRole",
-      "time": 1.37,
-      "skipped": false,
-      "failed": false,
-      "error": false,
-      "tags": ["security", "authorized"]
-    },
-
- */
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 

src/main/java/org/fugerit/java/junit5/tag/check/model/ReportHelper.java

@@ -11,14 +11,35 @@ public class ReportHelper {
 
     private ReportModel reportModel;
 
+    private Map<String, List<ExecutedTest>> tagToTests;
+
+    private Map<String, TestStats> tagStats;
+
     public ReportHelper(Map<ExecutedTest, Set<String>> testTagMap) {
         this.testTagMap = testTagMap;
+        // report model
         this.reportModel = new ReportModel();
         for (Map.Entry<ExecutedTest, Set<String>> entry : this.getTestTagMap().entrySet()) {
             ExecutedTest current = entry.getKey();
             current.getTags().addAll(entry.getValue());
             reportModel.getExecutedTests().add( current );
         }
+        // tag to test
+        this.tagToTests = new HashMap<>();
+        this.tagStats = new HashMap<>();
+
+        for (Map.Entry<ExecutedTest, Set<String>> entry : testTagMap.entrySet()) {
+            ExecutedTest test = entry.getKey();
+            for (String tag : entry.getValue()) {
+                tagToTests.computeIfAbsent(tag, k -> new ArrayList<>()).add(test);
+
+                TestStats stats = tagStats.computeIfAbsent(tag, k -> new TestStats());
+                stats.increaseTotal();
+                if (test.isFailed()) stats.increaseFailed();
+                if (test.isError()) stats.increaseErrors();
+                if (test.isSkipped()) stats.increaseSkipped();
+            }
+        }
     }
 
     public Map<ExecutedTest, Set<String>> getTestTagMap() {
@@ -42,14 +63,22 @@ public long getSummaryError() {
     }
 
     public Map<String, List<ExecutedTest>> getTagsSummary() {
-        Map<String, List<ExecutedTest>> tagToTests = new LinkedHashMap<>();
+        Map<String, List<ExecutedTest>> tagsSummary = new LinkedHashMap<>();
         for (Map.Entry<ExecutedTest, Set<String>> entry : this.getTestTagMap().entrySet()) {
             for (String tag : entry.getValue()) {
-                tagToTests.computeIfAbsent(tag, k -> new ArrayList<>()).add(entry.getKey());
+                tagsSummary.computeIfAbsent(tag, k -> new ArrayList<>()).add(entry.getKey());
             }
         }
-        log.debug( "getTagsSummary() : {}", tagToTests );
-        return tagToTests;
+        log.debug( "getTagsSummary() : {}", tagsSummary );
+        return tagsSummary;
+    }
+
+    public Map<String, List<ExecutedTest>> getTagsToTests() {
+        return this.tagToTests;
+    }
+
+    public Map<String, TestStats> getTagsStats() {
+        return this.tagStats;
     }
 
 }