Activate anonymous lambda reordering, #35

speedment · Jul 10, 2023 · 17b4edc · 17b4edc
1 parent fd1ca5f
commit 17b4edc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/jpastreamer.provider/jpastreamer.renderer.standard/pom.xml b/jpastreamer.provider/jpastreamer.renderer.standard/pom.xml
@@ -71,12 +71,18 @@
             <artifactId>termopmodifier</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.speedment.jpastreamer</groupId>
+            <artifactId>termopoptimizer</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
             <version>${jakarta.version}</version>
         </dependency>
-
+        
     </dependencies>
 
 

diff --git a/.../src/main/java/com/speedment/jpastreamer/renderer/standard/internal/StandardRenderer.java b/.../src/main/java/com/speedment/jpastreamer/renderer/standard/internal/StandardRenderer.java
@@ -34,6 +34,7 @@
 import com.speedment.jpastreamer.streamconfiguration.StreamConfiguration;
 
 import com.speedment.jpastreamer.termopmodifier.TerminalOperationModifierFactory;
+import com.speedment.jpastreamer.termopoptimizer.TerminalOperationOptimizerFactory;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.TypedQuery;
@@ -56,6 +57,7 @@ final class StandardRenderer implements Renderer {
 
     private final IntermediateOperationOptimizerFactory intermediateOperationOptimizerFactory;
     private final TerminalOperationModifierFactory terminalOperationModifierFactory;
+    private final TerminalOperationOptimizerFactory terminalOperationOptimizerFactory;
 
     private final MergerFactory mergerFactory;
 
@@ -69,6 +71,7 @@ final class StandardRenderer implements Renderer {
         this.predicateFactory = RootFactory.getOrThrow(PredicateFactory.class, ServiceLoader::load); 
         this.intermediateOperationOptimizerFactory = RootFactory.getOrThrow(IntermediateOperationOptimizerFactory.class, ServiceLoader::load);
         this.terminalOperationModifierFactory = RootFactory.getOrThrow(TerminalOperationModifierFactory.class, ServiceLoader::load);
+        this.terminalOperationOptimizerFactory = RootFactory.getOrThrow(TerminalOperationOptimizerFactory.class, ServiceLoader::load);
         this.mergerFactory = RootFactory.getOrThrow(MergerFactory.class, ServiceLoader::load);
     }
 
@@ -78,6 +81,7 @@ final class StandardRenderer implements Renderer {
         this.predicateFactory = RootFactory.getOrThrow(PredicateFactory.class, ServiceLoader::load);
         this.intermediateOperationOptimizerFactory = RootFactory.getOrThrow(IntermediateOperationOptimizerFactory.class, ServiceLoader::load);
         this.terminalOperationModifierFactory = RootFactory.getOrThrow(TerminalOperationModifierFactory.class, ServiceLoader::load);
+        this.terminalOperationOptimizerFactory = RootFactory.getOrThrow(TerminalOperationOptimizerFactory.class, ServiceLoader::load);
         this.mergerFactory = RootFactory.getOrThrow(MergerFactory.class, ServiceLoader::load);
     }
 
@@ -206,6 +210,7 @@ private <T> void modifyPipeline(final Pipeline<T> pipeline) {
 
     private <T> void optimizePipeline(final Pipeline<T> pipeline) {
         intermediateOperationOptimizerFactory.stream().forEach(intermediateOperationOptimizer -> intermediateOperationOptimizer.optimize(pipeline));
+        terminalOperationOptimizerFactory.get().optimize(pipeline);
     }
 
     @Override

diff --git a/jpastreamer.provider/jpastreamer.renderer.standard/src/main/java/module-info.java b/jpastreamer.provider/jpastreamer.renderer.standard/src/main/java/module-info.java
@@ -3,6 +3,7 @@
 import com.speedment.jpastreamer.merger.MergerFactory;
 import com.speedment.jpastreamer.renderer.RendererFactory;
 import com.speedment.jpastreamer.renderer.standard.StandardRendererFactory;
+import com.speedment.jpastreamer.termopoptimizer.TerminalOperationOptimizerFactory;
 
 /*
  * JPAstreamer - Express JPA queries with Java Streams
@@ -26,10 +27,12 @@
     requires jpastreamer.merger;
     requires jpastreamer.interopoptimizer;
     requires jpastreamer.termopmodifier;
+    requires jpastreamer.termopoptimizer;
 
     uses CriteriaFactory;
     uses MergerFactory;
     uses IntermediateOperationOptimizerFactory; 
+    uses TerminalOperationOptimizerFactory; 
 
     provides RendererFactory with StandardRendererFactory;
 }