github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2359 - Rename internal methods - BeanDescriptor

Browse Source
This commit is contained in:
rbygrave
2021-09-08 15:17:17 +12:00
parent d582e63c25
commit d389ac680f
129 changed files with 552 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java
Vendored
+1 -1
View File
@@ -79,7 +79,7 @@ public class CacheBeanDataTest extends BaseTestCase {
SpiEbeanServer server = spiEbeanServer();
BeanDescriptor<EPerson> desc = server.getBeanDescriptor(EPerson.class);
BeanPropertyAssocOne<?> addressBeanProperty = (BeanPropertyAssocOne<?>) desc.getBeanProperty("address");
BeanPropertyAssocOne<?> addressBeanProperty = (BeanPropertyAssocOne<?>) desc.beanProperty("address");
EAddress address = new EAddress();
address.setStreet("92 Someplace Else");
ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class BeanPropertyAssocManyTest extends BaseTestCase {
@SuppressWarnings("unchecked")
private BeanPropertyAssocMany<Customer> contacts() {
return (BeanPropertyAssocMany<Customer>) customerDesc.getBeanProperty("contacts");
return (BeanPropertyAssocMany<Customer>) customerDesc.beanProperty("contacts");
}
@Test
ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java
+4 -4
View File
@@ -35,8 +35,8 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
assertNotNull(beanDescriptor.idProperty());
assertEquals("id", beanDescriptor.idProperty().name());
assertNotNull(beanDescriptor.getVersionProperty());
assertEquals("updtime", beanDescriptor.getVersionProperty().name());
assertNotNull(beanDescriptor.versionProperty());
assertEquals("updtime", beanDescriptor.versionProperty().name());
Order order = new Order();
@@ -82,7 +82,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
Order order = new Order();
order.setId(42);
assertEquals(42, orderDesc.getIdForJson(order));
assertEquals(42, orderDesc.idForJson(order));
assertEquals(42, orderDesc.convertIdFromJson(42));
assertEquals(42, orderDesc.convertIdFromJson("42"));
@@ -99,7 +99,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
BeanDescriptor<RCustomer> rcustDesc = spiServer.getBeanDescriptor(RCustomer.class);
@SuppressWarnings("unchecked")
Map<String, Object> idForJson = (Map<String, Object>) rcustDesc.getIdForJson(rCustomer);
Map<String, Object> idForJson = (Map<String, Object>) rcustDesc.idForJson(rCustomer);
assertEquals("comp", idForJson.get("company"));
assertEquals("fred", idForJson.get("name"));
assertEquals(2, idForJson.size());
ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java
+4 -4
View File
@@ -26,17 +26,17 @@ public class TestCollectionLoadedStatus extends BaseTestCase {
EntityBean eb = (EntityBean) customer;
EntityBeanIntercept ebi = eb._ebean_getIntercept();
BeanProperty contactsProperty = custDesc.getBeanProperty("contacts");
assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex()));
BeanProperty contactsProperty = custDesc.beanProperty("contacts");
assertFalse(ebi.isLoadedProperty(contactsProperty.propertyIndex()));
Object contactsViaInternal = contactsProperty.getValue(eb);
assertNull(contactsViaInternal);
assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex()));
assertFalse(ebi.isLoadedProperty(contactsProperty.propertyIndex()));
List<Contact> contacts = customer.getContacts();
assertNotNull(contacts);
assertTrue(contacts instanceof BeanCollection);
assertTrue(ebi.isLoadedProperty(contactsProperty.getPropertyIndex()));
assertTrue(ebi.isLoadedProperty(contactsProperty.propertyIndex()));
}
}
ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java
+1 -3
View File
@@ -6,8 +6,6 @@ import io.ebeaninternal.server.deploy.BeanProperty;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer;
import java.util.EmptyStackException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -16,7 +14,7 @@ public class GeneratedCounterLongTest extends BaseTestCase {
private GeneratedCounterLong counter = new GeneratedCounterLong();
private BeanProperty version = getBeanDescriptor(Customer.class).getBeanProperty("version");
private BeanProperty version = getBeanDescriptor(Customer.class).beanProperty("version");
@Test
public void when_null_expect_IllegalStateException() {
ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class DLoadContextTest extends BaseTestCase {
@Test
public void construct_when_fetch_expect_100_100_batchSize() {
BeanPropertyAssocMany<?> many = (BeanPropertyAssocMany<?>)getBeanDescriptor(Order.class).getBeanProperty("details");
BeanPropertyAssocMany<?> many = (BeanPropertyAssocMany<?>)getBeanDescriptor(Order.class).beanProperty("details");
// the fetch is converted to a query join due to the maxRows
OrmQueryRequest<Order> queryRequest = queryRequest(query().fetch("details").setMaxRows(50));
queryRequest.initTransIfRequired();
ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java
+3 -3
View File
@@ -212,20 +212,20 @@ public class TestAnnotationBase extends BaseTestCase {
public void testFindMaxSize() throws SecurityException {
BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
BeanProperty bp = descriptor.findProperty("constraintAnnotation");
assertEquals(40, bp.getDbLength());
assertEquals(40, bp.dbLength());
}
@Test
public void testFindJakartaMaxSize() throws SecurityException {
BeanDescriptor<TestJakartaAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class);
BeanProperty bp = descriptor.findProperty("constraintAnnotation");
assertEquals(40, bp.getDbLength());
assertEquals(40, bp.dbLength());
}
@Test
public void annotationClassIndexes() throws SecurityException {
BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
final IndexDefinition[] indexDefinitions = descriptor.getIndexDefinitions();
final IndexDefinition[] indexDefinitions = descriptor.indexDefinitions();
assertEquals(3, indexDefinitions.length);
}
ebean-core/src/test/java/org/tests/basic/TestJodaType.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class TestJodaType extends BaseTestCase {
SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
BeanDescriptor<TJodaEntity> beanDescriptor = server.getBeanDescriptor(TJodaEntity.class);
BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime");
BeanProperty beanProperty = beanDescriptor.beanProperty("localTime");
ScalarType<?> scalarType = beanProperty.scalarType();
assertNotNull(scalarType);
ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class TestQueryWithCache extends BaseTestCase {
SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
BeanDescriptor<Country> beanDescriptor = server.getBeanDescriptor(Country.class);
CacheOptions cacheOptions = beanDescriptor.getCacheOptions();
CacheOptions cacheOptions = beanDescriptor.cacheOptions();
assertNotNull(cacheOptions);
assertTrue(cacheOptions.isReadOnly());
ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
BeanDescriptor<TestOnCascadeDeleteChildrenWithCompositeKeys.User> beanDescriptor =
spiServer.getBeanDescriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class);
BeanPropertyAssocMany<?> beanProperty = (BeanPropertyAssocMany<?>) beanDescriptor.getBeanProperty("userRoles");
BeanPropertyAssocMany<?> beanProperty = (BeanPropertyAssocMany<?>) beanDescriptor.beanProperty("userRoles");
List<Object> ids = new ArrayList<>();
ids.add(1L);
ebean-core/src/test/java/org/tests/el/TestELBasic.java
+9 -9
View File
@@ -23,20 +23,20 @@ public class TestELBasic extends BaseTestCase {
SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
BeanDescriptor<Customer> descriptor = server.getBeanDescriptor(Customer.class);
ElPropertyDeploy elId = descriptor.getElPropertyDeploy("id");
ElPropertyDeploy elId = descriptor.elPropertyDeploy("id");
assertTrue(elId instanceof BeanProperty);
ElPropertyDeploy elBillAddress = descriptor.getElPropertyDeploy("billingAddress");
ElPropertyDeploy elBillAddress = descriptor.elPropertyDeploy("billingAddress");
assertTrue(elBillAddress instanceof BeanPropertyAssocOne<?>);
ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id");
ElPropertyDeploy elBillAddressId = descriptor.elPropertyDeploy("billingAddress.id");
assertTrue(elBillAddressId instanceof BeanFkeyProperty);
assertEquals("billing_address_id", elBillAddressId.dbColumn());
assertEquals("billingAddress.id", elBillAddressId.name());
assertNull(elBillAddressId.elPrefix());
ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city");
ElPropertyDeploy elBillAddressCity = descriptor.elPropertyDeploy("billingAddress.city");
assertTrue(elBillAddressCity instanceof ElPropertyChain);
assertEquals("billingAddress", elBillAddressCity.elPrefix());
assertEquals("city", elBillAddressCity.name());
@@ -46,23 +46,23 @@ public class TestELBasic extends BaseTestCase {
// ElPropertyDeploy elBillAddressCountry = descriptor.getElPropertyDeploy("billingAddress.country");
ElPropertyDeploy elOrders = descriptor.getElPropertyDeploy("orders");
ElPropertyDeploy elOrders = descriptor.elPropertyDeploy("orders");
assertTrue(elOrders instanceof BeanPropertyAssocMany<?>);
ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status");
ElPropertyDeploy elOrderStatus = descriptor.elPropertyDeploy("orders.status");
assertTrue(elOrderStatus instanceof ElPropertyChain);
assertEquals("orders", elOrderStatus.elPrefix());
assertEquals("status", elOrderStatus.name());
assertEquals("${orders}status", elOrderStatus.elPlaceholder(false));
assertEquals("status", elOrderStatus.dbColumn());
ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer");
ElPropertyDeploy elOrderCust = descriptor.elPropertyDeploy("orders.customer");
assertTrue(elOrderCust instanceof ElPropertyChain);
ElPropertyDeploy elOrderDetails = descriptor.getElPropertyDeploy("orders.details");
ElPropertyDeploy elOrderDetails = descriptor.elPropertyDeploy("orders.details");
assertTrue(elOrderDetails instanceof ElPropertyChain);
ElPropertyDeploy elOrderDetailsId = descriptor.getElPropertyDeploy("orders.details.id");
ElPropertyDeploy elOrderDetailsId = descriptor.elPropertyDeploy("orders.details.id");
assertTrue(elOrderDetailsId instanceof ElPropertyChain);
}
ebean-core/src/test/java/org/tests/family/TestInheritance.java
+2 -2
View File
@@ -25,8 +25,8 @@ public class TestInheritance extends BaseTestCase {
@Test
public void testDescriptor() {
BeanDescriptor<GrandParentPerson> desc = spiEbeanServer().getBeanDescriptor(GrandParentPerson.class);
BeanProperty prop1 = desc.getBeanProperty("someBean");
BeanProperty prop2 = desc.getBeanProperty("effectiveBean");
BeanProperty prop1 = desc.beanProperty("someBean");
BeanProperty prop2 = desc.beanProperty("effectiveBean");
assertEquals(BeanPropertyAssocOne.class, prop1.getClass());
assertEquals(BeanPropertyAssocOne.class, prop2.getClass());
ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java
+1 -2
View File
@@ -2,7 +2,6 @@ package org.tests.query.joins;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.FetchConfig;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.el.ElPropertyValue;
@@ -23,7 +22,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase {
SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
BeanDescriptor<Order> d = server.getBeanDescriptor(Order.class);
ElPropertyValue elGetValue = d.getElGetValue("customer.contacts");
ElPropertyValue elGetValue = d.elGetValue("customer.contacts");
assertTrue(elGetValue.containsMany());
ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase {
SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
BeanDescriptor<Order> descOrder = server.getBeanDescriptor(Order.class);
BeanPropertyAssocMany<?> beanProperty = (BeanPropertyAssocMany<?>) descOrder.getBeanProperty("details");
BeanPropertyAssocMany<?> beanProperty = (BeanPropertyAssocMany<?>) descOrder.beanProperty("details");
List<Object> parentIds = new ArrayList<>();
parentIds.add(1);
ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class TestInheritWithMany extends BaseTestCase {
SpiEbeanServer spiServer = (SpiEbeanServer) server;
BeanDescriptor<IMRoot> beanDescriptor = spiServer.getBeanDescriptor(IMRoot.class);
InheritInfo inheritInfo = beanDescriptor.getInheritInfo();
InheritInfo inheritInfo = beanDescriptor.inheritInfo();
assertNotNull(inheritInfo);