From 0d0a3422fce8ac1bafeac0ca5c9b4a04c988474e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 28 Feb 2018 21:11:49 +1300 Subject: [PATCH] #1283 - ENH: Support simplified test configuration (with docker setup typically via application-test.yml) Refactor tidy - no effective change on this commit. --- src/main/java/io/ebean/config/ServerConfig.java | 5 ++--- .../io/ebeaninternal/server/core/ClassPathScanners.java | 9 ++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java index d2819f42b..29ac1032d 100644 --- a/src/main/java/io/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -2616,9 +2616,8 @@ public class ServerConfig { * configuration with Docker containers via ebean-test-config. */ private void autoConfiguration() { - Iterator iterator = serviceLoad(AutoConfigure.class).iterator(); - while (iterator.hasNext()) { - iterator.next().configure(this); + for (AutoConfigure autoConfigure : serviceLoad(AutoConfigure.class)) { + autoConfigure.configure(this); } } diff --git a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java index 38222784a..9074eba55 100644 --- a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java +++ b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java @@ -6,7 +6,6 @@ import org.avaje.classpath.scanner.ClassPathScannerFactory; import java.util.ArrayList; import java.util.List; -import java.util.ServiceLoader; /** * Utility to finds and return the list of ClassPathScanner services. @@ -19,13 +18,9 @@ public class ClassPathScanners { public static List find(ServerConfig serverConfig) { List scanners = new ArrayList<>(); - - ServiceLoader scannerLoader = serverConfig.serviceLoad(ClassPathScannerFactory.class); - for (ClassPathScannerFactory factory : scannerLoader) { - ClassPathScanner scanner = factory.createScanner(serverConfig.getClassLoadConfig().getClassLoader()); - scanners.add(scanner); + for (ClassPathScannerFactory factory : serverConfig.serviceLoad(ClassPathScannerFactory.class)) { + scanners.add(factory.createScanner(serverConfig.getClassLoadConfig().getClassLoader())); } - return scanners; } }