clean up

Author: manojdbos

src/main/java/dev/dbos/transact/database/SystemDatabase.java

@@ -346,7 +346,6 @@ public <T> T callFunctionAsStep(Supplier<T> fn, String functionName)  {
                 functionResult = fn.get();
             } catch (Exception e) {
                 if (ctx != null && ctx.isInWorkflow()) {
-                    // recordOperationError(ctx, functionName, e);
                     String jsonError = JSONUtil.serializeError(e);
                     StepResult r = new StepResult(ctx.getWorkflowId(), nextFuncId, functionName, null, jsonError);
                     stepsDAO.recordStepResultTxn(r);

src/main/java/dev/dbos/transact/execution/DBOSExecutor.java

@@ -363,8 +363,6 @@ public <T> T runStep(String stepName,
 
         if (recordedResult != null) {
 
-            logger.info("There is an recorded result for step " + stepFunctionId) ;
-
             String output = recordedResult.getOutput() ;
             if (output != null) {
                 logger.info("Result has an output") ;
@@ -377,8 +375,6 @@ public <T> T runStep(String stepName,
                 // TODO: fix deserialization of errors
                 throw new Exception(error);
             }
-        } else {
-            logger.info("There is an No recorded result for step " + stepFunctionId) ;
         }
 
         int currAttempts = 1 ;
@@ -388,8 +384,6 @@ public <T> T runStep(String stepName,
 
         while (retriedAllowed && currAttempts <= maxAttempts) {
 
-            logger.info("curr attempt " + currAttempts) ;
-
             try {
                 result = function.execute();
                 serializedOutput = JSONUtil.serialize(result);

src/main/java/dev/dbos/transact/json/JSONUtil.java

@@ -18,17 +18,6 @@ public class JSONUtil {
 
     private static final ObjectMapper mapper = new ObjectMapper();
 
-    /* static {
-        // mapper.activateDefaultTyping(mapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
-        PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator.builder()
-                .allowIfSubType(Object.class)
-                .build();
-
-        // This ensures type info is added even for final classes like String, Integer, etc.
-        mapper.activateDefaultTyping(ptv, ObjectMapper.DefaultTyping.EVERYTHING, JsonTypeInfo.As.PROPERTY);
-
-    } */
-
     static {
         mapper.registerModule(new JavaTimeModule());
         mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); // Optional
@@ -67,21 +56,7 @@ public static SerializableException deserializeError(String json) {
     }
 
 
-    /* public static <T> T deserialize(String json, Class<T> clazz) {
-        try {
-            return mapper.readValue(json, clazz);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException("Deserialization failed", e);
-        }
-    }
 
-    public static <T> T deserialize(String json, TypeReference<T> typeRef) {
-        try {
-            return mapper.readValue(json, typeRef);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException("Deserialization failed", e);
-        }
-    } */
 
 }
 

src/test/java/dev/dbos/transact/workflow/WorkflowMgmtTest.java

@@ -5,6 +5,7 @@
 import dev.dbos.transact.context.DBOSOptions;
 import dev.dbos.transact.context.SetDBOSOptions;
 import dev.dbos.transact.database.SystemDatabase;
+import dev.dbos.transact.exceptions.AwaitedWorkflowCancelledException;
 import dev.dbos.transact.exceptions.WorkflowCancelledException;
 import dev.dbos.transact.execution.DBOSExecutor;
 import dev.dbos.transact.execution.ExecutingService;
@@ -125,6 +126,8 @@ public void asyncCancelResumeTest() throws Exception {
         result = (Integer) handle.getResult() ;
         assertEquals(23, result);
         assertEquals(3, mgmtService.getStepsExecuted()) ;
+        h = dbosExecutor.retrieveWorkflow(workflowId) ;
+        assertEquals(WorkflowState.SUCCESS.name(), h.getStatus().getStatus());
 
         logger.info("Test completed");
 
@@ -172,6 +175,8 @@ public void queuedCancelResumeTest() throws Exception {
         result = (Integer) handle.getResult() ;
         assertEquals(23, result);
         assertEquals(3, mgmtService.getStepsExecuted()) ;
+        h = dbosExecutor.retrieveWorkflow(workflowId) ;
+        assertEquals(WorkflowState.SUCCESS.name(), h.getStatus().getStatus());
 
         logger.info("Test completed");
 
@@ -205,46 +210,26 @@ public void syncCancelResumeTest() throws Exception {
                     mgmtService.simpleWorkflow(23);
                 }
             } catch(Throwable t) {
-                logger.info("caught ex");
-                // assertTrue(t instanceof WorkflowCancelledException) ;
+                assertTrue(t instanceof AwaitedWorkflowCancelledException) ;
             }
 
             assertEquals(1, mgmtService.getStepsExecuted()) ;
-            logger.info("counting down latch") ;
             testLatch.countDown();
-            logger.info("exiting thread 1") ;
         }) ;
 
-
-
-        // mainLatch.await();
-        // dbos.cancelWorkflow(workflowId);
-        // workLatch.countDown();
-
-
-
         e.submit(() -> {
             try {
                 mainLatch.await();
                 dbos.cancelWorkflow(workflowId);
                 workLatch.countDown();
-
-                logger.info("2 counting down lotch") ;
                 testLatch.countDown();
-                logger.info("2 after counting down lotch") ;
-
 
             } catch(InterruptedException ie) {
                 logger.error(ie.toString()) ;
             }
-            logger.info("Exiting thread 2") ;
         }) ;
 
-        logger.info("Before test latch");
         testLatch.await();
-        logger.info("after test latch");
-
-
 
         WorkflowHandle<?> handle = dbos.resumeWorkflow(workflowId) ;