Adjust code

playframework · May 11, 2022 · 692ae03 · 692ae03
1 parent 3e12f16
commit 692ae03
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java b/play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java
@@ -214,7 +214,7 @@ private static class Classpath {
          * @return a set of types names satisfying the condition
          */
         static Set<String> getTypes(Environment env, String packageName) {
-            return getReflections(env, packageName).getStore().keys(TypeElementsScanner.class.getSimpleName());
+            return getReflections(env, packageName).getStore().getOrDefault(TypeElementsScanner.class.getSimpleName(), Collections.emptyMap()).keySet();
         }
         private static Reflections getReflections(Environment env, String packageName) {
             // This is not supposed to happen very often, but just when starting the application.
@@ -232,7 +232,7 @@ private static Reflections getReflections(Environment env, String packageName) {
         private static ConfigurationBuilder getReflectionsConfiguration(String packageName, ClassLoader classLoader) {
             return new ConfigurationBuilder()
                     .addUrls(ClasspathHelper.forPackage(packageName, classLoader))
-                    .filterInputsBy(new FilterBuilder().include(FilterBuilder.prefix(packageName + ".")))
+                    .filterInputsBy(new FilterBuilder().includePackage((packageName + ".").replace(".","\\.") + ".*"))
                     .setScanners(new TypeElementsScanner(), new TypeAnnotationsScanner(), new SubTypesScanner());
         }