Make rootfactory run under the module system, Fix #16

speedment · Jun 25, 2020 · f09cc8e · f09cc8e
1 parent cf5ca4f
commit f09cc8e
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 27 deletions.
diff --git a/application/src/main/java/com/speedment/jpastreamer/application/JpaStreamer.java b/application/src/main/java/com/speedment/jpastreamer/application/JpaStreamer.java
@@ -3,6 +3,7 @@
 import com.speedment.jpastreamer.rootfactory.RootFactory;
 
 import javax.persistence.EntityManagerFactory;
+import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
 public interface JpaStreamer {
@@ -13,13 +14,13 @@ public interface JpaStreamer {
 
     static JpaStreamerBuilder createJpaStreamerBuilder(final String persistenceUnitName) {
         return RootFactory
-                .getOrThrow(JpaStreamerBuilderFactory.class)
+                .getOrThrow(JpaStreamerBuilderFactory.class, ServiceLoader::load)
                 .create(persistenceUnitName);
     }
 
     static JpaStreamerBuilder createJpaStreamerBuilder(final EntityManagerFactory entityManagerFactory) {
         return RootFactory
-                .getOrThrow(JpaStreamerBuilderFactory.class)
+                .getOrThrow(JpaStreamerBuilderFactory.class, ServiceLoader::load)
                 .create(entityManagerFactory);
     }
 

diff --git a/application/src/main/java9/module-info.java b/application/src/main/java9/module-info.java
@@ -20,5 +20,6 @@
 
     requires transitive java.persistence;
     requires jpastreamer.rootfactory;
+    uses com.speedment.jpastreamer.application.JpaStreamerBuilderFactory;
 
 }
diff --git a/...c/main/java/com/speedment/jpastreamer/application/standard/internal/StandardStreamer.java b/...c/main/java/com/speedment/jpastreamer/application/standard/internal/StandardStreamer.java
@@ -1,6 +1,7 @@
 package com.speedment.jpastreamer.application.standard.internal;
 
 import javax.persistence.EntityManagerFactory;
+import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
 import static java.util.Objects.requireNonNull;
@@ -19,8 +20,8 @@ final class StandardStreamer<E> implements Streamer<E> {
 
     StandardStreamer(final Class<E> entityClass, final EntityManagerFactory entityManagerFactory) {
         this.entityClass = requireNonNull(entityClass);
-        this.builderFactory = RootFactory.getOrThrow(BuilderFactory.class);
-        this.renderer = RootFactory.getOrThrow(RendererFactory.class)
+        this.builderFactory = RootFactory.getOrThrow(BuilderFactory.class, ServiceLoader::load);
+        this.renderer = RootFactory.getOrThrow(RendererFactory.class, ServiceLoader::load)
             .createRenderer(entityManagerFactory);
     }
 

diff --git a/.../src/main/java/com/speedment/jpastreamer/builder/standard/internal/InjectedFactories.java b/.../src/main/java/com/speedment/jpastreamer/builder/standard/internal/InjectedFactories.java
@@ -8,6 +8,8 @@
 import com.speedment.jpastreamer.renderer.RendererFactory;
 import com.speedment.jpastreamer.rootfactory.RootFactory;
 
+import java.util.ServiceLoader;
+
 enum InjectedFactories implements Factories {
     INSTANCE;
 
@@ -17,10 +19,10 @@ enum InjectedFactories implements Factories {
     private final AutoCloseFactory autoClose;
 
     InjectedFactories() {
-        pipeline = RootFactory.getOrThrow(PipelineFactory.class);
-        intermediate = RootFactory.getOrThrow(IntermediateOperationFactory.class);
-        terminal = RootFactory.getOrThrow(TerminalOperationFactory.class);
-        autoClose = RootFactory.getOrThrow(AutoCloseFactory.class);
+        pipeline = RootFactory.getOrThrow(PipelineFactory.class, ServiceLoader::load);
+        intermediate = RootFactory.getOrThrow(IntermediateOperationFactory.class, ServiceLoader::load);
+        terminal = RootFactory.getOrThrow(TerminalOperationFactory.class, ServiceLoader::load);
+        autoClose = RootFactory.getOrThrow(AutoCloseFactory.class, ServiceLoader::load);
     }
 
     @Override

diff --git a/...peedment/jpastreamer/merger/standard/internal/criteria/strategy/FilterCriteriaMerger.java b/...peedment/jpastreamer/merger/standard/internal/criteria/strategy/FilterCriteriaMerger.java
@@ -32,6 +32,7 @@
 import javax.persistence.criteria.Predicate;
 import java.util.List;
 import java.util.Optional;
+import java.util.ServiceLoader;
 
 public enum FilterCriteriaMerger implements CriteriaMerger {
 
@@ -40,7 +41,7 @@ public enum FilterCriteriaMerger implements CriteriaMerger {
     private final PredicateFactory predicateFactory;
 
     FilterCriteriaMerger() {
-        this.predicateFactory = RootFactory.getOrThrow(PredicateFactory.class);
+        this.predicateFactory = RootFactory.getOrThrow(PredicateFactory.class, ServiceLoader::load);
     }
 
     @Override

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
@@ -16,6 +16,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.TypedQuery;
+import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
 public final class StandardRenderer implements Renderer {
@@ -30,10 +31,10 @@ public final class StandardRenderer implements Renderer {
 
     StandardRenderer(final EntityManagerFactory entityManagerFactory) {
         this.entityManager = requireNonNull(entityManagerFactory).createEntityManager();
-        this.criteriaFactory = RootFactory.getOrThrow(CriteriaFactory.class);
-        this.criteriaMerger = RootFactory.getOrThrow(CriteriaMerger.class);
-        this.queryMerger = RootFactory.getOrThrow(QueryMerger.class);
-        this.preOptimizerFactory = RootFactory.getOrThrow(PreOptimizerFactory.class);
+        this.criteriaFactory = RootFactory.getOrThrow(CriteriaFactory.class, ServiceLoader::load);
+        this.criteriaMerger = RootFactory.getOrThrow(CriteriaMerger.class, ServiceLoader::load);
+        this.queryMerger = RootFactory.getOrThrow(QueryMerger.class, ServiceLoader::load);
+        this.preOptimizerFactory = RootFactory.getOrThrow(PreOptimizerFactory.class, ServiceLoader::load);
     }
 
     @Override

diff --git a/rootfactory/src/main/java/com/speedment/jpastreamer/rootfactory/RootFactory.java b/rootfactory/src/main/java/com/speedment/jpastreamer/rootfactory/RootFactory.java
@@ -3,21 +3,23 @@
 import com.speedment.jpastreamer.rootfactory.internal.InternalRootFactory;
 
 import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 public final class RootFactory {
     private RootFactory() {}
 
-    public static <T> Optional<T> get(final Class<T> classToken) {
-        return InternalRootFactory.get(classToken);
+    public static <S> Optional<S> get(final Class<S> classToken, final Function<Class<S>, ServiceLoader<S>> loader) {
+        return InternalRootFactory.get(classToken, loader);
     }
 
-    public static <T> T getOrThrow(final Class<T> classToken) {
-        return InternalRootFactory.getOrThrow(classToken);
+    public static <S> S getOrThrow(final Class<S> classToken, final Function<Class<S>, ServiceLoader<S>> loader) {
+        return InternalRootFactory.getOrThrow(classToken, loader);
     }
 
-    public static <S> Stream<S> stream(final Class<S> service) {
-        return InternalRootFactory.stream(service);
+    public static <S> Stream<S> stream(final Class<S> service, final Function<Class<S>, ServiceLoader<S>> loader) {
+        return InternalRootFactory.stream(service, loader);
     }
 
 }
diff --git a/...ory/src/main/java/com/speedment/jpastreamer/rootfactory/internal/InternalRootFactory.java b/...ory/src/main/java/com/speedment/jpastreamer/rootfactory/internal/InternalRootFactory.java
@@ -1,29 +1,38 @@
 package com.speedment.jpastreamer.rootfactory.internal;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import static java.util.Objects.requireNonNull;
+
 public final class InternalRootFactory {
 
     private InternalRootFactory() {
     }
 
-    public static <S> Optional<S> get(final Class<S> service) {
-        return Optional.ofNullable(getHelper(service));
+    public static <S> Optional<S> get(final Class<S> service, final Function<Class<S>, ServiceLoader<S>> loader) {
+        requireNonNull(service);
+        requireNonNull(loader);
+        return Optional.ofNullable(getHelper(service, loader));
     }
 
-    public static <S> S getOrThrow(final Class<S> service) {
-        final S selectedService = getHelper(service);
+    public static <S> S getOrThrow(final Class<S> service, Function<Class<S>, ServiceLoader<S>> loader) {
+        requireNonNull(service);
+        requireNonNull(loader);
+        final S selectedService = getHelper(service, loader);
         if (selectedService == null) {
             throw new NoSuchElementException("Unable to get the service " + service.getName());
         } else {
             return selectedService;
         }
     }
 
-    public static <S> Stream<S> stream(final Class<S> service) {
-        final Iterator<S> iterator = ServiceLoader.load(service).iterator();
+    public static <S> Stream<S> stream(final Class<S> service, final Function<Class<S>, ServiceLoader<S>> loader ) {
+        requireNonNull(service);
+        requireNonNull(loader);
+        final Iterator<S> iterator = loader.apply(service).iterator();
         if (iterator.hasNext()) {
             return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL), false);
         } else {
@@ -38,8 +47,8 @@ public static <S> Stream<S> stream(final Class<S> service) {
 
     }
 
-    private static <S> S getHelper(final Class<S> service) {
-        final Iterator<S> iterator = ServiceLoader.load(service).iterator();
+    private static <S> S getHelper(final Class<S> service,  Function<Class<S>, ServiceLoader<S>> loader) {
+        final Iterator<S> iterator = loader.apply(service).iterator();
         if (iterator.hasNext()) {
             return iterator.next();
         } else {