From 7a7dbae313e845ed7e469ba0429766bfdd71cf7c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:52:34 +1200 Subject: [PATCH] #2342 - Rename Database.getName() to Database.name() with deprecation --- .../src/main/java/io/ebean/bean/BeanCollectionLoader.java | 2 +- .../src/main/java/io/ebean/common/AbstractBeanCollection.java | 4 ++-- .../io/ebeaninternal/server/loadcontext/DLoadManyContext.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java index 2f0e2848d..b7dc32034 100644 --- a/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java +++ b/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java @@ -11,7 +11,7 @@ public interface BeanCollectionLoader { /** * Return the name of the associated Database. */ - String getName(); + String name(); /** * Invoke the lazy loading for this bean collection. diff --git a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java index 809ca13b3..912d9582f 100644 --- a/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java +++ b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java @@ -63,7 +63,7 @@ abstract class AbstractBeanCollection implements BeanCollection { */ AbstractBeanCollection(BeanCollectionLoader loader, EntityBean ownerBean, String propertyName) { this.loader = loader; - this.ebeanServerName = loader.getName(); + this.ebeanServerName = loader.name(); this.ownerBean = ownerBean; this.propertyName = propertyName; this.readOnly = ownerBean != null && ownerBean._ebean_getIntercept().isReadOnly(); @@ -111,7 +111,7 @@ abstract class AbstractBeanCollection implements BeanCollection { public void setLoader(BeanCollectionLoader loader) { this.registeredWithLoadContext = true; this.loader = loader; - this.ebeanServerName = loader.getName(); + this.ebeanServerName = loader.name(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java index 5f09de0b3..e549d49fb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -177,7 +177,7 @@ final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext } @Override - public String getName() { + public String name() { return context.serverName; }