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();