mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
#2374 - Bump to Java 11 and module-path
This commit is contained in:
1 parent
79be375f54
commit
24d8f38b1d
71 files changed
+149
-366
No files matched your search
@@ -23,6 +23,7 @@ import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import javax.persistence.PersistenceException;
|
||||
import java.net.URL;
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
@@ -136,9 +137,21 @@ public final class DefaultContainer implements SpiContainer {
|
||||
}
|
||||
if (config.isAutoLoadModuleInfo()) {
|
||||
// auto register entity classes
|
||||
boolean found = false;
|
||||
for (ModuleInfoLoader loader : ServiceLoader.load(ModuleInfoLoader.class)) {
|
||||
config.addAll(loader.classesFor(config.getName(), config.isDefaultServer()));
|
||||
found = true;
|
||||
}
|
||||
if (!found) {
|
||||
checkMissingModulePathProvides();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void checkMissingModulePathProvides() {
|
||||
URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.ModuleInfoLoader");
|
||||
if (servicesFile != null) {
|
||||
log.error("module-info.java is probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause. ModuleInfoLoader exists but was not service loaded.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -562,7 +562,29 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T> BeanManager<T> beanManager(Class<T> entityType) {
|
||||
return (BeanManager<T>) beanManager(entityType.getName());
|
||||
BeanManager<T> mgr = (BeanManager<T>) beanManager(entityType.getName());
|
||||
if (mgr == null) {
|
||||
errorBeanNotRegistered(entityType);
|
||||
}
|
||||
return mgr;
|
||||
}
|
||||
|
||||
private <T> void errorBeanNotRegistered(Class<T> entityType) {
|
||||
if (beanManagerMap.isEmpty()) {
|
||||
throw new PersistenceException(errNothingRegistered());
|
||||
} else {
|
||||
throw new PersistenceException(errNotRegistered(entityType));
|
||||
}
|
||||
}
|
||||
|
||||
private <T> String errNothingRegistered() {
|
||||
return "There are no registered entities. If using query beans, that generates _Ebean$ModuleInfo.java into " +
|
||||
"generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause.";
|
||||
}
|
||||
|
||||
private String errNotRegistered(Class<?> beanClass) {
|
||||
return "The type [" + beanClass + "] is not a registered entity?"
|
||||
+ " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
|
||||
}
|
||||
|
||||
private BeanManager<?> beanManager(String beanClassName) {
|
||||
|
||||
@@ -1196,11 +1196,6 @@ public final class DefaultPersister implements Persister {
|
||||
return request;
|
||||
}
|
||||
|
||||
private String errNotRegistered(Class<?> beanClass) {
|
||||
return "The type [" + beanClass + "] is not a registered entity?"
|
||||
+ " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the BeanDescriptor for a bean that is being persisted.
|
||||
* <p>
|
||||
@@ -1210,10 +1205,6 @@ public final class DefaultPersister implements Persister {
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T> BeanManager<T> beanManager(Class<?> cls) {
|
||||
BeanManager<T> mgr = (BeanManager<T>) beanDescriptorManager.beanManager(cls);
|
||||
if (mgr == null) {
|
||||
throw new PersistenceException(errNotRegistered(cls));
|
||||
}
|
||||
return mgr;
|
||||
return (BeanManager<T>) beanDescriptorManager.beanManager(cls);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user