Add generic parameter to OperationEvaluator

mikosik · mikosik · commit ebbf449ad451 · 2025-12-07T18:06:23.000+01:00
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/cache/CachingOperatorEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/cache/CachingOperatorEvaluator.java
@@ -82,7 +82,7 @@ public CachingOperatorEvaluator(
     this.memoryCache = memoryCache;
   }
 
-  public Output<BValue> evaluate(OperationEvaluator evaluator, List<BValue> bValues) {
+  public Output<BValue> evaluate(OperationEvaluator<?> evaluator, List<BValue> bValues) {
     try {
       return evaluate(evaluator, toInput(bValues));
     } catch (IOException e) {
@@ -94,7 +94,7 @@ private BTuple toInput(List<BValue> depResults) throws BytecodeException {
     return bytecodeFactory.tuple(depResults);
   }
 
-  protected Output<BValue> evaluate(OperationEvaluator evaluator, BTuple subExprValues)
+  protected Output<BValue> evaluate(OperationEvaluator<?> evaluator, BTuple subExprValues)
       throws IOException {
     var purity = evaluator.purity(subExprValues);
     var hash = computationHashFactory.create(evaluator.operation(), subExprValues);
@@ -112,7 +112,7 @@ protected Output<BValue> evaluate(OperationEvaluator evaluator, BTuple subExprVa
   }
 
   private Promise<Maybe<BValue>> scheduleTaskWaitingForOtherTaskResult(
-      OperationEvaluator evaluator, Purity purity, Promise<BOutput> otherTaskResult) {
+      OperationEvaluator<?> evaluator, Purity purity, Promise<BOutput> otherTaskResult) {
     Task1<BOutput, BValue> task = (bOutput) -> {
       try {
         return newOutput(evaluator, bOutput, purity.cacheLevel());
@@ -124,7 +124,7 @@ private Promise<Maybe<BValue>> scheduleTaskWaitingForOtherTaskResult(
   }
 
   private Output<BValue> readEvaluationFromDiskCache(
-      OperationEvaluator evaluator, Hash hash, MutablePromise<BOutput> resultPromise)
+      OperationEvaluator<?> evaluator, Hash hash, MutablePromise<BOutput> resultPromise)
       throws IOException {
     var bOutput = diskCache.read(hash, evaluator.operation().evaluationType());
     resultPromise.accept(bOutput);
@@ -133,7 +133,7 @@ private Output<BValue> readEvaluationFromDiskCache(
   }
 
   private Output<BValue> evaluateNow(
-      OperationEvaluator evaluator,
+      OperationEvaluator<?> evaluator,
       BTuple subExprValues,
       MutablePromise<BOutput> resultPromise,
       Purity purity,
@@ -152,17 +152,17 @@ private Output<BValue> evaluateNow(
   }
 
   private static Output<BValue> newOutput(
-      OperationEvaluator evaluator, BOutput bOutput, Origin source) throws BytecodeException {
+      OperationEvaluator<?> evaluator, BOutput bOutput, Origin source) throws BytecodeException {
     var report = newReport(evaluator, bOutput, source);
     return bOutput.value().map(v -> output(v, report)).getOr(output(report));
   }
 
-  private static Output<BValue> outputForException(OperationEvaluator evaluator, Exception e) {
+  private static Output<BValue> outputForException(OperationEvaluator<?> evaluator, Exception e) {
     var fatal = fatal("Vm evaluation Task failed with exception:", e);
     return output(report(VM_EVALUATE, evaluator.trace(), list(fatal)));
   }
 
-  private static Report newReport(OperationEvaluator evaluator, BOutput bOutput, Origin origin)
+  private static Report newReport(OperationEvaluator<?> evaluator, BOutput bOutput, Origin origin)
       throws BytecodeException {
     var logs = bOutput
         .storedLogs()
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BChooseEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BChooseEvaluator.java
@@ -11,11 +11,10 @@
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BInt;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BTuple;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BValue;
-import org.smoothbuild.virtualmachine.bytecode.kind.base.BChoiceType;
 import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;
 import org.smoothbuild.virtualmachine.evaluate.plugin.Container;
 
-public final class BChooseEvaluator extends OperationEvaluator {
+public final class BChooseEvaluator extends OperationEvaluator<BChoose> {
   public BChooseEvaluator(BChoose choose, Trace trace) {
     super(choose, trace);
   }
@@ -25,8 +24,7 @@ public BOutput evaluate(BTuple subExprValues, Container container) throws Byteco
     var components = subExprValues.elements();
     var index = index(components);
     var chosen = chosen(components);
-    var choice =
-        container.factory().choice((BChoiceType) operation().evaluationType(), index, chosen);
+    var choice = container.factory().choice(operation().evaluationType(), index, chosen);
     return bOutput(choice, container.messages());
   }
 
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BCombineEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BCombineEvaluator.java
@@ -9,7 +9,7 @@
 import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;
 import org.smoothbuild.virtualmachine.evaluate.plugin.Container;
 
-public final class BCombineEvaluator extends OperationEvaluator {
+public final class BCombineEvaluator extends OperationEvaluator<BCombine> {
   public BCombineEvaluator(BCombine combine, Trace trace) {
     super(combine, trace);
   }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BInvokeEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BInvokeEvaluator.java
@@ -23,7 +23,7 @@
 import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;
 import org.smoothbuild.virtualmachine.evaluate.plugin.Container;
 
-public final class BInvokeEvaluator extends OperationEvaluator {
+public final class BInvokeEvaluator extends OperationEvaluator<BInvoke> {
   public BInvokeEvaluator(BInvoke invoke, Trace trace) {
     super(invoke, trace);
   }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BOrderEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BOrderEvaluator.java
@@ -7,11 +7,10 @@
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BArray;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BOrder;
 import org.smoothbuild.virtualmachine.bytecode.expr.base.BTuple;
-import org.smoothbuild.virtualmachine.bytecode.kind.base.BArrayType;
 import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;
 import org.smoothbuild.virtualmachine.evaluate.plugin.Container;
 
-public final class BOrderEvaluator extends OperationEvaluator {
+public final class BOrderEvaluator extends OperationEvaluator<BOrder> {
   public BOrderEvaluator(BOrder order, Trace trace) {
     super(order, trace);
   }
@@ -20,7 +19,7 @@ public BOrderEvaluator(BOrder order, Trace trace) {
   public BOutput evaluate(BTuple subExprValues, Container container) throws BytecodeException {
     BArray array = container
         .factory()
-        .arrayBuilder((BArrayType) operation().evaluationType())
+        .arrayBuilder(operation().evaluationType())
         .addAll(subExprValues.elements())
         .build();
     return bOutput(array, container.messages());
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BPickEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BPickEvaluator.java
@@ -15,7 +15,7 @@
 import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;
 import org.smoothbuild.virtualmachine.evaluate.plugin.Container;
 
-public final class BPickEvaluator extends OperationEvaluator {
+public final class BPickEvaluator extends OperationEvaluator<BPick> {
   public BPickEvaluator(BPick pick, Trace trace) {
     super(pick, trace);
   }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BSelectEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/BSelectEvaluator.java
@@ -14,7 +14,7 @@
 import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;
 import org.smoothbuild.virtualmachine.evaluate.plugin.Container;
 
-public final class BSelectEvaluator extends OperationEvaluator {
+public final class BSelectEvaluator extends OperationEvaluator<BSelect> {
   public BSelectEvaluator(BSelect select, Trace trace) {
     super(select, trace);
   }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/OperationEvaluator.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/evaluator/OperationEvaluator.java
@@ -18,22 +18,22 @@
  *
  * This class is thread-safe.
  */
-public abstract sealed class OperationEvaluator
+public abstract sealed class OperationEvaluator<T extends BOperation>
     permits BChooseEvaluator,
         BCombineEvaluator,
         BInvokeEvaluator,
         BOrderEvaluator,
         BPickEvaluator,
         BSelectEvaluator {
-  private final BOperation operation;
+  private final T operation;
   private final Trace trace;
 
-  public OperationEvaluator(BOperation operation, Trace trace) {
+  public OperationEvaluator(T operation, Trace trace) {
     this.operation = operation;
     this.trace = trace;
   }
 
-  public BOperation operation() {
+  public T operation() {
     return operation;
   }
 
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BChooseJob.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BChooseJob.java
@@ -15,7 +15,7 @@ public BChooseJob(JobContext jobContext, BChoose choose, List<Job> environment,
   }
 
   @Override
-  protected OperationEvaluator createEvaluator() {
+  protected OperationEvaluator<BChoose> createEvaluator() {
     return new BChooseEvaluator(choose, trace());
   }
 }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BCombineJob.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BCombineJob.java
@@ -15,7 +15,7 @@ public BCombineJob(JobContext jobContext, BCombine combine, List<Job> environmen
   }
 
   @Override
-  protected OperationEvaluator createEvaluator() {
+  protected OperationEvaluator<BCombine> createEvaluator() {
     return new BCombineEvaluator(combine, trace());
   }
 }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BInvokeJob.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BInvokeJob.java
@@ -15,7 +15,7 @@ public BInvokeJob(JobContext jobContext, BInvoke invoke, List<Job> environment,
   }
 
   @Override
-  protected OperationEvaluator createEvaluator() {
+  protected OperationEvaluator<BInvoke> createEvaluator() {
     return new BInvokeEvaluator(invoke, trace());
   }
 }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BOperationJob.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BOperationJob.java
@@ -30,5 +30,5 @@ private Output<BValue> evaluate(List<BValue> bValues) {
     return cachingOperatorEvaluator().evaluate(createEvaluator(), bValues);
   }
 
-  protected abstract OperationEvaluator createEvaluator();
+  protected abstract OperationEvaluator<?> createEvaluator();
 }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BOrderJob.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BOrderJob.java
@@ -15,7 +15,7 @@ public BOrderJob(JobContext jobContext, BOrder order, List<Job> environment, Tra
   }
 
   @Override
-  protected OperationEvaluator createEvaluator() {
+  protected OperationEvaluator<BOrder> createEvaluator() {
     return new BOrderEvaluator(order, trace());
   }
 }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BPickJob.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BPickJob.java
@@ -15,7 +15,7 @@ public BPickJob(JobContext jobContext, BPick pick, List<Job> environment, Trace
   }
 
   @Override
-  protected OperationEvaluator createEvaluator() {
+  protected OperationEvaluator<BPick> createEvaluator() {
     return new BPickEvaluator(pick, trace());
   }
 }
diff --git a/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BSelectJob.java b/src/virtual-machine/src/main/java/org/smoothbuild/virtualmachine/evaluate/job/BSelectJob.java
@@ -15,7 +15,7 @@ public BSelectJob(JobContext jobContext, BSelect select, List<Job> environment,
   }
 
   @Override
-  protected OperationEvaluator createEvaluator() {
+  protected OperationEvaluator<BSelect> createEvaluator() {
     return new BSelectEvaluator(select, trace());
   }
 }
diff --git a/src/virtual-machine/src/test/java/org/smoothbuild/virtualmachine/evaluate/BEvaluateTaskTest.java b/src/virtual-machine/src/test/java/org/smoothbuild/virtualmachine/evaluate/BEvaluateTaskTest.java
@@ -549,7 +549,8 @@ void evaluation_scheduler_that_throws_exception_is_detected() throws Exception {
             new CachingOperatorEvaluator(
                 mock(), mock(), mock(), scheduler, provide().bytecodeFactory()) {
               @Override
-              public Output<BValue> evaluate(OperationEvaluator evaluator, BTuple subExprValues) {
+              public Output<BValue> evaluate(
+                  OperationEvaluator<?> evaluator, BTuple subExprValues) {
                 throw runtimeException;
               }
             };
diff --git a/src/virtual-machine/src/test/java/org/smoothbuild/virtualmachine/evaluate/cache/CachingOperatorEvaluatorTest.java b/src/virtual-machine/src/test/java/org/smoothbuild/virtualmachine/evaluate/cache/CachingOperatorEvaluatorTest.java
@@ -295,7 +295,7 @@ void executed_computation_is_cached_on_disk() throws Exception {
   }
 
   private void assertComputationResult(
-      OperationEvaluator evaluator,
+      OperationEvaluator<?> evaluator,
       BTuple subExprValues,
       @Nullable BValue memoryValue,
       @Nullable BValue diskValue,
@@ -335,7 +335,7 @@ private CachingOperatorEvaluator cachingOperatorEvaluatorWithCaches(
 
   private void assertComputationResult(
       CachingOperatorEvaluator cachingOperatorEvaluator,
-      OperationEvaluator evaluator,
+      OperationEvaluator<?> evaluator,
       BTuple subExprValues,
       BOutput expectedOutput,
       Origin expectedOrigin)
@@ -353,7 +353,7 @@ private void assertComputationResult(
   }
 
   private void assertCachesState(
-      OperationEvaluator evaluator,
+      OperationEvaluator<?> evaluator,
       BTuple subExprValues,
       @Nullable BOutput memoryValue,
       @Nullable BValue diskValue)

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;`
`10`	`10`	`import org.smoothbuild.virtualmachine.evaluate.plugin.Container;`
`11`	`11`
`12`		`-public final class BCombineEvaluator extends OperationEvaluator {`
	`12`	`+public final class BCombineEvaluator extends OperationEvaluator<BCombine> {`
`13`	`13`	`public BCombineEvaluator(BCombine combine, Trace trace) {`
`14`	`14`	`super(combine, trace);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;`
`24`	`24`	`import org.smoothbuild.virtualmachine.evaluate.plugin.Container;`
`25`	`25`
`26`		`-public final class BInvokeEvaluator extends OperationEvaluator {`
	`26`	`+public final class BInvokeEvaluator extends OperationEvaluator<BInvoke> {`
`27`	`27`	`public BInvokeEvaluator(BInvoke invoke, Trace trace) {`
`28`	`28`	`super(invoke, trace);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;`
`16`	`16`	`import org.smoothbuild.virtualmachine.evaluate.plugin.Container;`
`17`	`17`
`18`		`-public final class BPickEvaluator extends OperationEvaluator {`
	`18`	`+public final class BPickEvaluator extends OperationEvaluator<BPick> {`
`19`	`19`	`public BPickEvaluator(BPick pick, Trace trace) {`
`20`	`20`	`super(pick, trace);`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`import org.smoothbuild.virtualmachine.evaluate.plugin.BOutput;`
`15`	`15`	`import org.smoothbuild.virtualmachine.evaluate.plugin.Container;`
`16`	`16`
`17`		`-public final class BSelectEvaluator extends OperationEvaluator {`
	`17`	`+public final class BSelectEvaluator extends OperationEvaluator<BSelect> {`
`18`	`18`	`public BSelectEvaluator(BSelect select, Trace trace) {`
`19`	`19`	`super(select, trace);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public BChooseJob(JobContext jobContext, BChoose choose, List<Job> environment,`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@Override`
`18`		`- protected OperationEvaluator createEvaluator() {`
	`18`	`+ protected OperationEvaluator<BChoose> createEvaluator() {`
`19`	`19`	`return new BChooseEvaluator(choose, trace());`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public BCombineJob(JobContext jobContext, BCombine combine, List<Job> environmen`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@Override`
`18`		`- protected OperationEvaluator createEvaluator() {`
	`18`	`+ protected OperationEvaluator<BCombine> createEvaluator() {`
`19`	`19`	`return new BCombineEvaluator(combine, trace());`
`20`	`20`	`}`
`21`	`21`	`}`