From 2e587beadce991c325425fa0f785d8fbdbb05b4e Mon Sep 17 00:00:00 2001
From: Jason Walonoski <jwalonoski@mitre.org>
Date: Wed, 3 Apr 2024 09:30:04 -0400
Subject: [PATCH] Convert String predicate to ModuleSupplier predicate.

---
 src/main/java/org/mitre/synthea/engine/Module.java          | 4 ++--
 .../java/org/mitre/synthea/helpers/TransitionMetrics.java   | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/mitre/synthea/engine/Module.java b/src/main/java/org/mitre/synthea/engine/Module.java
index 9a68d0e1c6..309aac20e1 100644
--- a/src/main/java/org/mitre/synthea/engine/Module.java
+++ b/src/main/java/org/mitre/synthea/engine/Module.java
@@ -260,10 +260,10 @@ public static List<ModuleSupplier> getModuleSuppliers() {
    * @param predicate A predicate to filter a module based on path.
    * @return A list of ModuleSuppliers.
    */
-  public static List<ModuleSupplier> getModuleSuppliers(Predicate<String> predicate) {
+  public static List<ModuleSupplier> getModuleSuppliers(Predicate<ModuleSupplier> predicate) {
     List<ModuleSupplier> list = new ArrayList<ModuleSupplier>();
     modules.forEach((k, v) -> {
-      if (predicate.test(v.path)) {
+      if (predicate.test(v)) {
         list.add(v);
       }
     });
diff --git a/src/main/java/org/mitre/synthea/helpers/TransitionMetrics.java b/src/main/java/org/mitre/synthea/helpers/TransitionMetrics.java
index 9ac5049398..e41ff60140 100644
--- a/src/main/java/org/mitre/synthea/helpers/TransitionMetrics.java
+++ b/src/main/java/org/mitre/synthea/helpers/TransitionMetrics.java
@@ -111,12 +111,8 @@ public static void exportMetrics() {
     Path output = Paths.get(baseDir, statsDir);
     output.toFile().mkdirs();
 
-    List<ModuleSupplier> suppliers = Module.getModuleSuppliers();
+    List<ModuleSupplier> suppliers = Module.getModuleSuppliers(p -> !p.core);
     for (ModuleSupplier supplier : suppliers) {
-      if (supplier.core) {
-        // Java module
-        continue;
-      }
       // System.out.println("Saving statistics: " + supplier.path);
 
       Map<String, Metric> moduleMetrics = metrics.row(supplier.get().name);