refactor, still not working

DataBiosphere · Oct 3, 2024 · 8f5b078 · 8f5b078
1 parent b5753bb
commit 8f5b078
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/service/src/main/java/bio/terra/pipelines/common/utils/FlightUtils.java b/service/src/main/java/bio/terra/pipelines/common/utils/FlightUtils.java
@@ -3,6 +3,7 @@
 import bio.terra.common.exception.MissingRequiredFieldException;
 import bio.terra.pipelines.dependencies.stairway.JobMapKeys;
 import bio.terra.pipelines.generated.model.ApiErrorReport;
+import bio.terra.pipelines.stairway.imputation.PipelineRunTypeFlight;
 import bio.terra.stairway.FlightContext;
 import bio.terra.stairway.FlightMap;
 import bio.terra.stairway.FlightState;
@@ -160,11 +161,14 @@ public static boolean flightComplete(FlightState flightState) {
   }
 
   /** Get a class object from a string. Return null if no matching class name found. */
-  public static Class<?> getFlightClassFromString(String className) {
+  public static boolean classNameIsPipelineRunTypeFlightClass(String className) {
     try {
-      return Class.forName(className);
-    } catch (ClassNotFoundException e) {
-      return null;
+      Class cls = Class.forName(className);
+      PipelineRunTypeFlight pipelineRunTypeFlight =
+          (PipelineRunTypeFlight) cls.getDeclaredConstructor().newInstance();
+      return true;
+    } catch (ReflectiveOperationException e) {
+      return false;
     }
   }
 }
diff --git a/service/src/main/java/bio/terra/pipelines/common/utils/StairwayFailedMetricsCounterHook.java b/service/src/main/java/bio/terra/pipelines/common/utils/StairwayFailedMetricsCounterHook.java
@@ -1,10 +1,9 @@
 package bio.terra.pipelines.common.utils;
 
-import static bio.terra.pipelines.common.utils.FlightUtils.getFlightClassFromString;
+import static bio.terra.pipelines.common.utils.FlightUtils.classNameIsPipelineRunTypeFlightClass;
 
 import bio.terra.pipelines.app.common.MetricsUtils;
 import bio.terra.pipelines.dependencies.stairway.JobMapKeys;
-import bio.terra.pipelines.stairway.imputation.PipelineRunTypeFlight;
 import bio.terra.stairway.FlightContext;
 import bio.terra.stairway.FlightStatus;
 import bio.terra.stairway.HookAction;
@@ -27,13 +26,7 @@ public HookAction endFlight(FlightContext context) {
       return HookAction.CONTINUE;
     }
 
-    Class<?> flightClass = getFlightClassFromString(context.getFlightClassName());
-    if (flightClass == null) {
-      logger.warn(
-          "Failed to interpret flight class {}, skipping metrics hook",
-          context.getFlightClassName());
-      return HookAction.CONTINUE;
-    } else if (flightClass.isInstance(PipelineRunTypeFlight.class)
+    if (classNameIsPipelineRunTypeFlightClass(context.getFlightClassName())
         && context.getFlightStatus() != FlightStatus.SUCCESS) {
       logger.info("Flight failed, incrementing failed flight counter");
 

diff --git a/service/src/main/java/bio/terra/pipelines/common/utils/StairwaySetPipelineRunStatusHook.java b/service/src/main/java/bio/terra/pipelines/common/utils/StairwaySetPipelineRunStatusHook.java
@@ -1,10 +1,9 @@
 package bio.terra.pipelines.common.utils;
 
-import static bio.terra.pipelines.common.utils.FlightUtils.getFlightClassFromString;
+import static bio.terra.pipelines.common.utils.FlightUtils.classNameIsPipelineRunTypeFlightClass;
 
 import bio.terra.pipelines.dependencies.stairway.JobMapKeys;
 import bio.terra.pipelines.service.PipelineRunsService;
-import bio.terra.pipelines.stairway.imputation.PipelineRunTypeFlight;
 import bio.terra.stairway.FlightContext;
 import bio.terra.stairway.FlightStatus;
 import bio.terra.stairway.HookAction;
@@ -31,13 +30,7 @@ public HookAction endFlight(FlightContext context) {
       return HookAction.CONTINUE;
     }
 
-    Class<?> flightClass = getFlightClassFromString(context.getFlightClassName());
-    if (flightClass == null) {
-      logger.warn(
-          "Failed to interpret flight class {}, skipping update status hook",
-          context.getFlightClassName());
-      return HookAction.CONTINUE;
-    } else if (flightClass.isInstance(PipelineRunTypeFlight.class)
+    if (classNameIsPipelineRunTypeFlightClass(context.getFlightClassName())
         && context.getFlightStatus() != FlightStatus.SUCCESS) {
       logger.info(
           "Flight has status {}, setting PipelineRun status to FAILED", context.getFlightStatus());

diff --git a/service/src/test/java/bio/terra/pipelines/common/utils/FlightUtilsTest.java b/service/src/test/java/bio/terra/pipelines/common/utils/FlightUtilsTest.java
@@ -225,4 +225,11 @@ void flightComplete_running_isNotComplete() {
     // flightComplete returns True if flight is SUCCESS, ERROR, or FATAL
     assertFalse(FlightUtils.flightComplete(flightState));
   }
+
+  @Test
+  void classNameIsPipelineRunTypeFlightClass_true() {
+    assertTrue(
+        FlightUtils.classNameIsPipelineRunTypeFlightClass(
+            "bio.terra.pipelines.stairway.imputation.RunImputationGcpJobFlight"));
+  }
 }