Move non-formatting method back to model.

Author: uhafner

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/model/ElementFormatter.java

@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -15,7 +14,6 @@
 import edu.hm.hafner.coverage.FractionValue;
 import edu.hm.hafner.coverage.IntegerValue;
 import edu.hm.hafner.coverage.Metric;
-import edu.hm.hafner.coverage.Node;
 import edu.hm.hafner.coverage.Percentage;
 import edu.hm.hafner.coverage.Value;
 
@@ -417,23 +415,6 @@ public List<String> getFormattedValues(final Stream<? extends Value> values, fin
  return values.map(value -> formatDetails(value, locale)).collect(Collectors.toList());
  }
 
- /**
- * Returns a stream of {@link Coverage} values for the given root node sorted by the metric ordinal.
- *
- * @param coverage
- * The coverage root node
- *
- * @return a stream containing the existent coverage values
- */
- public Stream<Coverage> getSortedCoverageValues(final Node coverage) {
- return Metric.getCoverageMetrics()
- .stream()
- .map(m -> m.getValueFor(coverage))
- .flatMap(Optional::stream)
- .filter(value -> value instanceof Coverage)
- .map(Coverage.class::cast);
- }
-
  /**
  * Returns a localized human-readable label for the specified metric.
  *

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java

@@ -487,10 +487,19 @@ public List<String> getMetrics() {
  }
 
  private Stream<Coverage> sortCoverages() {
- return ELEMENT_FORMATTER.getSortedCoverageValues(coverage)
+ return getSortedCoverageValues()
  .filter(c -> c.getTotal() > 1); // ignore elements that have a total of 1
  }
 
+ private Stream<Coverage> getSortedCoverageValues() {
+ return Metric.getCoverageMetrics()
+ .stream()
+ .map(m -> m.getValueFor(coverage))
+ .flatMap(Optional::stream)
+ .filter(value -> value instanceof Coverage)
+ .map(Coverage.class::cast);
+ }
+
  public List<Integer> getCovered() {
  return getCoverageCounter(Coverage::getCovered);
  }