Add module-info support via multi-version jar (#2381)

ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java

@@ -1,10 +1,5 @@
 package io.ebean.config;
 
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-
 /**
  * Helper to find classes taking into account the context class loader.
  */
@@ -77,22 +72,14 @@ public class ClassLoadConfig {
    * Return a new instance of the class using the default constructor.
    */
   public Object newInstance(String className) {
-
     try {
       Class<?> cls = forName(className);
-      return cls.newInstance();
+      return cls.getDeclaredConstructor().newInstance();
     } catch (Exception e) {
       throw new IllegalArgumentException("Error constructing " + className, e);
     }
   }
 
-  /**
-   * Return the resources for the given name.
-   */
-  public Enumeration<URL> getResources(String name) throws IOException {
-    return context.getResources(name);
-  }
-
   /**
    * Return true if the given class is present.
    */
@@ -129,9 +116,7 @@ public class ClassLoadConfig {
      * Optional - if set only use this classLoader (no fallback).
      */
     protected final ClassLoader preferredLoader;
-
     protected final ClassLoader contextLoader;
-
     protected final ClassLoader callerLoader;
 
     ClassLoaderContext(ClassLoader preferredLoader) {
@@ -145,15 +130,7 @@ public class ClassLoadConfig {
       return (loader != null) ? loader : callerLoader;
     }
 
-    Enumeration<URL> getResources(String name) throws IOException {
-      if (preferredLoader != null) {
-        return preferredLoader.getResources(name);
-      }
-      return contextLoader().getResources(name);
-    }
-
     Class<?> forName(String name) throws ClassNotFoundException {
-
       if (preferredLoader != null) {
         // only use the explicitly set classLoader
         return classForName(name, preferredLoader);

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

@@ -2,11 +2,7 @@ package io.ebean.config;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import io.avaje.config.Config;
-import io.ebean.DatabaseFactory;
-import io.ebean.EbeanVersion;
-import io.ebean.PersistenceContextScope;
-import io.ebean.Query;
-import io.ebean.Transaction;
+import io.ebean.*;
 import io.ebean.annotation.*;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -14,14 +10,7 @@ import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.datasource.DataSourceConfig;
-import io.ebean.event.BeanFindController;
-import io.ebean.event.BeanPersistController;
-import io.ebean.event.BeanPersistListener;
-import io.ebean.event.BeanPostConstructListener;
-import io.ebean.event.BeanPostLoad;
-import io.ebean.event.BeanQueryAdapter;
-import io.ebean.event.BulkTableEventListener;
-import io.ebean.event.ServerConfigStartup;
+import io.ebean.event.*;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
@@ -34,14 +23,7 @@ import javax.sql.DataSource;
 import java.time.Clock;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
+import java.util.*;
 
 /**
  * The configuration used for creating a Database.
@@ -82,7 +64,6 @@ import java.util.ServiceLoader;
  */
 public class DatabaseConfig {
 
-
   /**
    * The Database name.
    */
@@ -402,8 +383,8 @@ public class DatabaseConfig {
   private List<BeanPostConstructListener> postConstructListeners = new ArrayList<>();
   private List<BeanPersistListener> persistListeners = new ArrayList<>();
   private List<BeanQueryAdapter> queryAdapters = new ArrayList<>();
-  private List<BulkTableEventListener> bulkTableEventListeners = new ArrayList<>();
-  private List<ServerConfigStartup> configStartupListeners = new ArrayList<>();
+  private final List<BulkTableEventListener> bulkTableEventListeners = new ArrayList<>();
+  private final List<ServerConfigStartup> configStartupListeners = new ArrayList<>();
 
   /**
    * By default inserts are included in the change log.
@@ -411,42 +392,26 @@ public class DatabaseConfig {
   private boolean changeLogIncludeInserts = true;
 
   private ChangeLogPrepare changeLogPrepare;
-
   private ChangeLogListener changeLogListener;
-
   private ChangeLogRegister changeLogRegister;
-
   private boolean changeLogAsync = true;
-
   private ReadAuditLogger readAuditLogger;
-
   private ReadAuditPrepare readAuditPrepare;
-
   private EncryptKeyManager encryptKeyManager;
-
   private EncryptDeployManager encryptDeployManager;
-
   private Encryptor encryptor;
-
-  private boolean dbOffline;
-
   private DbEncrypt dbEncrypt;
-
+  private boolean dbOffline;
   private ServerCachePlugin serverCachePlugin;
 
   /**
    * The default PersistenceContextScope used if one is not explicitly set on a query.
    */
   private PersistenceContextScope persistenceContextScope = PersistenceContextScope.TRANSACTION;
-
   private JsonFactory jsonFactory;
-
   private boolean localTimeWithNanos;
-
   private boolean durationWithNanos;
-
   private int maxCallStack = 5;
-
   private boolean transactionRollbackOnChecked = true;
 
   // configuration for the background executor service (thread pool)
@@ -2741,21 +2706,7 @@ public class DatabaseConfig {
     this.classLoadConfig = classLoadConfig;
   }
 
-  /**
-   * Return the service loader using the classLoader defined in ClassLoadConfig.
-   */
-  public <T> ServiceLoader<T> serviceLoad(Class<T> spiService) {
-    return ServiceLoader.load(spiService, classLoadConfig.getClassLoader());
-  }
 
-  /**
-   * Return the first service using the service loader (or null).
-   */
-  public <T> T service(Class<T> spiService) {
-    ServiceLoader<T> load = serviceLoad(spiService);
-    Iterator<T> serviceInstances = load.iterator();
-    return serviceInstances.hasNext() ? serviceInstances.next() : null;
-  }
 
   /**
    * Load settings from application.properties, application.yaml and other sources.
@@ -2794,7 +2745,7 @@ public class DatabaseConfig {
    */
   private List<AutoConfigure> autoConfiguration() {
     List<AutoConfigure> list = new ArrayList<>();
-    for (AutoConfigure autoConfigure : serviceLoad(AutoConfigure.class)) {
+    for (AutoConfigure autoConfigure : ServiceLoader.load(AutoConfigure.class)) {
       autoConfigure.preConfigure(this);
       list.add(autoConfigure);
     }