From 47dfbb6157d8564f0397243a7b34121659f2403f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 10 Nov 2022 13:11:08 +1300 Subject: [PATCH] #2864 - Not advertise services configurable via DatabaseConfig.putServiceObject() that are "internal" "internal" meaning that in terms of module-path they are not in a properly exported package. For example, they are in a subpackage of io.ebeaninternal --- .../main/java/io/ebean/cache/ServerCacheNotification.java | 1 - .../main/java/io/ebean/cache/ServerCacheNotifyPlugin.java | 1 - .../src/main/java/io/ebean/config/DatabaseConfig.java | 8 -------- 3 files changed, 10 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java index 99c4340ef..0a9b3580e 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java @@ -6,7 +6,6 @@ import java.util.Set; * Notification event that dependent tables have been modified. *

* This is sent to other interested servers (in the cluster). - *

*/ public class ServerCacheNotification { diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java index ae0c9f852..a783cf8e8 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java @@ -6,7 +6,6 @@ import io.ebean.config.DatabaseConfig; * Plugin that provides a ServerCacheNotify implementation. *

* Is supplied this will be used to send the ServerCacheNotification event to other cluster members. - *

*/ public interface ServerCacheNotifyPlugin { diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index 0a1bb0472..b03be0956 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -32,13 +32,11 @@ import java.util.function.Function; *

* Used to programmatically construct an Database and optionally register it * with the DB singleton. - *

*

* If you just use DB thout this programmatic configuration Ebean will read * the application.properties file and take the configuration from there. This usually * includes searching the class path and automatically registering any entity * classes and listeners etc. - *

*
{@code
  *
  * DatabaseConfig config = new DatabaseConfig();
@@ -58,7 +56,6 @@ import java.util.function.Function;
  * 

* Note that DatabaseConfigProvider provides a standard Java ServiceLoader mechanism that can * be used to apply configuration to the DatabaseConfig. - *

* * @author emcgreal * @author rbygrave @@ -632,13 +629,8 @@ public class DatabaseConfig { * */ public void putServiceObject(Class iface, T configObject) {