Merge pull request #134 from jenkinsci/dependabot/maven/edu.hm.hafner…

…-codingstyle-pom-5.4.0 Bump edu.hm.hafner:codingstyle-pom from 5.3.0 to 5.4.0
jenkinsci · Nov 12, 2024 · aea4bae · aea4bae
2 parents 6e1ef5a + 8de78f0
commit aea4bae
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 9 deletions.
diff --git a/.github/workflows/quality-monitor.yml b/.github/workflows/quality-monitor.yml
@@ -137,35 +137,76 @@ jobs:
                   ]
                 }
               ],
-              "metrics": [
+              "metrics": 
                 {
                   "name": "Toplevel Metrics",
                   "tools": [
                     {
                       "name": "Cyclomatic Complexity",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
-                      "metric": "CyclomaticComplexity"
+                      "metric": "CYCLOMATIC_COMPLEXITY"
                     },
                     {
                       "name": "Cognitive Complexity",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
-                      "metric": "CognitiveComplexity"
+                      "metric": "COGNITIVE_COMPLEXITY"
+                    },
+                    {
+                      "name": "Lines of Code",
+                      "id": "metrics",
+                      "pattern": "**/metrics/pmd.xml",
+                      "metric": "LOC"
                     },
                     {
                       "name": "Non Commenting Source Statements",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
                       "metric": "NCSS"
                     },
+                    {
+                      "name": "Access to foreign data",
+                      "id": "metrics",
+                      "pattern": "**/metrics/pmd.xml",
+                      "metric": "ACCESS_TO_FOREIGN_DATA"
+                    },
+                    {
+                      "name": "Class cohesion",
+                      "id": "metrics",
+                      "pattern": "**/metrics/pmd.xml",
+                      "metric": "COHESION"
+                    },
+                    {
+                      "name": "Fan out",
+                      "id": "metrics",
+                      "pattern": "**/metrics/pmd.xml",
+                      "metric": "FAN_OUT"
+                    },
+                    {
+                      "name": "Number of accessors",
+                      "id": "metrics",
+                      "pattern": "**/metrics/pmd.xml",
+                      "metric": "NUMBER_OF_ACCESSORS"
+                    },
+                    {
+                      "name": "Weight of a class",
+                      "id": "metrics",
+                      "pattern": "**/metrics/pmd.xml",
+                      "metric": "WEIGHT_OF_CLASS"
+                    },
+                    {
+                      "name": "Weighted method count",
+                      "id": "metrics",
+                      "pattern": "**/metrics/pmd.xml",
+                      "metric": "WEIGHED_METHOD_COUNT"
+                    },
                     {
                       "name": "N-Path Complexity",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
-                      "metric": "NPathComplexity"
+                      "metric": "NPATH_COMPLEXITY"
                     }
                   ]
                 }
-              ]
             }
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>edu.hm.hafner</groupId>
     <artifactId>codingstyle-pom</artifactId>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <relativePath />
   </parent>
 

diff --git a/src/main/java/edu/hm/hafner/coverage/Metric.java b/src/main/java/edu/hm/hafner/coverage/Metric.java
@@ -371,22 +371,22 @@ public boolean isAggregatingChildren() {
 
         @Override
         final Optional<Value> computeDerivedValue(final Node node, final Metric searchMetric) {
-            var defaultValue = getDefaultValue(node, searchMetric);
+            var defaultValue = getDefaultValue(node);
 
             return defaultValue.or(() -> node.getChildren().stream()
                     .map(n -> compute(n, searchMetric))
                     .flatMap(Optional::stream)
                     .reduce(accumulator));
         }
 
-        protected Optional<Value> getDefaultValue(final Node node, final Metric searchMetric) {
+        protected Optional<Value> getDefaultValue(final Node node) {
             return Optional.empty();
         }
     }
 
     private static class LocEvaluator extends ValuesAggregator {
         @Override
-        protected Optional<Value> getDefaultValue(final Node node, final Metric searchMetric) {
+        protected Optional<Value> getDefaultValue(final Node node) {
             return LINE.getValueFor(node).map(this::getTotal);
         }