github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-26 16:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1888 - Bump ebean-migration 12.1.2 with updated avaje classpath scanner

Browse Source
This commit is contained in:
rob bygrave
2019-12-13 13:06:13 +13:00
parent 06bd60aaf7
commit 91e7540a39
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
+2 -2
View File
@@ -1,8 +1,8 @@
package io.ebeaninternal.server.core;
import io.avaje.classpath.scanner.ClassPathScanner;
import io.avaje.classpath.scanner.ClassPathScannerFactory;
import io.ebean.config.ServerConfig;
import org.avaje.classpath.scanner.ClassPathScanner;
import org.avaje.classpath.scanner.ClassPathScannerFactory;
import java.util.ArrayList;
import java.util.List;
src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
+2 -2
View File
@@ -1,13 +1,13 @@
package io.ebeaninternal.server.core;
import io.avaje.classpath.scanner.ClassPathScanner;
import io.avaje.classpath.scanner.Resource;
import io.ebean.config.ServerConfig;
import io.ebeaninternal.server.dto.DtoNamedQueries;
import io.ebeaninternal.xmlmapping.XmlMappingReader;
import io.ebeaninternal.xmlmapping.model.XmDto;
import io.ebeaninternal.xmlmapping.model.XmEbean;
import io.ebeaninternal.xmlmapping.model.XmRawSql;
import org.avaje.classpath.scanner.ClassPathScanner;
import org.avaje.classpath.scanner.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
+1 -1
View File
@@ -1,8 +1,8 @@
package io.ebeaninternal.server.core.bootup;
import io.avaje.classpath.scanner.ClassPathScanner;
import io.ebean.config.ServerConfig;
import io.ebeaninternal.server.core.ClassPathScanners;
import org.avaje.classpath.scanner.ClassPathScanner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+1 -1
View File
@@ -1,5 +1,6 @@
package io.ebeaninternal.server.core.bootup;
import io.avaje.classpath.scanner.ClassFilter;
import io.ebean.annotation.DocStore;
import io.ebean.config.IdGenerator;
import io.ebean.config.ScalarTypeConverter;
@@ -18,7 +19,6 @@ import io.ebean.event.readaudit.ReadAuditLogger;
import io.ebean.event.readaudit.ReadAuditPrepare;
import io.ebean.util.AnnotationUtil;
import io.ebeaninternal.server.type.ScalarType;
import org.avaje.classpath.scanner.ClassFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+3 -3
View File
@@ -1,8 +1,8 @@
package io.ebeaninternal.xmlmapping;
import io.avaje.classpath.scanner.Resource;
import io.ebeaninternal.util.UrlHelper;
import io.ebeaninternal.xmlmapping.model.XmEbean;
import org.avaje.classpath.scanner.Resource;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -36,7 +36,7 @@ public class XmlMappingReader {
/**
* Read the deployment XML for the given resource name.
*/
public static List<XmEbean> readByResourceName(ClassLoader classLoader, String resourceName){
public static List<XmEbean> readByResourceName(ClassLoader classLoader, String resourceName) {
try {
Enumeration<URL> resources = classLoader.getResources(resourceName);
List<XmEbean> mappings = new ArrayList<>();
@@ -55,7 +55,7 @@ public class XmlMappingReader {
/**
* Read the deployment XML for the given resources.
*/
public static List<XmEbean> readByResourceList(List<Resource> resourceList){
public static List<XmEbean> readByResourceList(List<Resource> resourceList) {
try {
List<XmEbean> mappings = new ArrayList<>();
for (Resource xmlMappingRes : resourceList) {