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 plugin api methods with deprecation - BeanType

Browse Source
This commit is contained in:
rbygrave
2021-09-08 13:13:29 +12:00
parent d6dc147497
commit bc02eeac57
69 changed files with 467 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java
+18 -18
View File
@@ -31,33 +31,33 @@ public class BeanTypeTest {
@Test
public void getBeanType() {
assertThat(beanType(Order.class).getBeanType()).isEqualTo(Order.class);
assertThat(beanType(Order.class).type()).isEqualTo(Order.class);
}
@Test
public void getTypeAtPath_when_ManyToOne() {
BeanType<Order> orderType = beanType(Order.class);
BeanType<?> customerType = orderType.getBeanTypeAtPath("customer");
assertThat(customerType.getBeanType()).isEqualTo(Customer.class);
BeanType<?> customerType = orderType.beanTypeAtPath("customer");
assertThat(customerType.type()).isEqualTo(Customer.class);
}
@Test
public void getTypeAtPath_when_OneToMany() {
BeanType<Order> orderType = beanType(Order.class);
BeanType<?> detailsType = orderType.getBeanTypeAtPath("details");
assertThat(detailsType.getBeanType()).isEqualTo(OrderDetail.class);
BeanType<?> detailsType = orderType.beanTypeAtPath("details");
assertThat(detailsType.type()).isEqualTo(OrderDetail.class);
}
@Test
public void getTypeAtPath_when_nested() {
BeanType<Order> orderType = beanType(Order.class);
BeanType<?> productType = orderType.getBeanTypeAtPath("details.product");
assertThat(productType.getBeanType()).isEqualTo(Product.class);
BeanType<?> productType = orderType.beanTypeAtPath("details.product");
assertThat(productType.type()).isEqualTo(Product.class);
}
@Test
public void getTypeAtPath_when_simpleType() {
assertThrows(RuntimeException.class, () -> beanType(Order.class).getBeanTypeAtPath("status"));
assertThrows(RuntimeException.class, () -> beanType(Order.class).beanTypeAtPath("status"));
}
@Test
@@ -70,7 +70,7 @@ public class BeanTypeTest {
Order order = new Order();
order.setStatus(Order.Status.APPROVED);
Property statusProperty = beanType(Order.class).getProperty("status");
Property statusProperty = beanType(Order.class).property("status");
assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus());
}
@@ -78,7 +78,7 @@ public class BeanTypeTest {
@Test
public void getBaseTable() {
assertThat(beanType(Order.class).getBaseTable()).isEqualTo("o_order");
assertThat(beanType(Order.class).baseTable()).isEqualTo("o_order");
}
@Test
@@ -87,7 +87,7 @@ public class BeanTypeTest {
Order order = new Order();
order.setId(42);
Object id1 = beanType(Order.class).beanId(order);
Object id1 = beanType(Order.class).id(order);
assertThat(id1).isEqualTo(order.getId());
}
@@ -95,7 +95,7 @@ public class BeanTypeTest {
public void setBeanId() {
Order order = new Order();
beanType(Order.class).setBeanId(order, 42);
beanType(Order.class).setId(order, 42);
assertThat(42).isEqualTo(order.getId());
}
@@ -106,8 +106,8 @@ public class BeanTypeTest {
assertThat(beanType(Order.class).isDocStoreMapped()).isFalse();
assertThat(beanType(Person.class).isDocStoreMapped()).isFalse();
assertThat(beanType(Order.class).getDocMapping()).isNotNull();
assertThat(beanType(Person.class).getDocMapping()).isNull();
assertThat(beanType(Order.class).docMapping()).isNotNull();
assertThat(beanType(Person.class).docMapping()).isNull();
}
@Test
@@ -136,8 +136,8 @@ public class BeanTypeTest {
@Test
public void getDocStoreQueueId() {
assertThat(beanType(Order.class).getDocStoreQueueId()).isEqualTo("order");
assertThat(beanType(Customer.class).getDocStoreQueueId()).isEqualTo("customer");
assertThat(beanType(Order.class).docStoreQueueId()).isEqualTo("order");
assertThat(beanType(Customer.class).docStoreQueueId()).isEqualTo("customer");
}
@Test
@@ -205,12 +205,12 @@ public class BeanTypeTest {
@Test
public void getDiscColumn_when_default() {
assertEquals(beanType(Car.class).getDiscColumn(), "dtype");
assertEquals(beanType(Car.class).discColumn(), "dtype");
}
@Test
public void getDiscColumn_when_set() {
assertEquals(beanType(Stockforecast.class).getDiscColumn(), "type");
assertEquals(beanType(Stockforecast.class).discColumn(), "type");
}
@Test
ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java
+10 -10
View File
@@ -22,42 +22,42 @@ public class ExpressionPathTest {
public void containsMany_when_many() throws Exception {
BeanType<Order> beanType = beanType(Order.class);
assertThat(beanType.getExpressionPath("details").containsMany()).isTrue();
assertThat(beanType.expressionPath("details").containsMany()).isTrue();
}
@Test
public void containsMany_when_manyChild() throws Exception {
BeanType<Order> beanType = beanType(Order.class);
assertThat(beanType.getExpressionPath("details.id").containsMany()).isTrue();
assertThat(beanType.expressionPath("details.id").containsMany()).isTrue();
}
@Test
public void containsMany_when_manyGrandChild() throws Exception {
BeanType<Order> beanType = beanType(Order.class);
assertThat(beanType.getExpressionPath("details.product.sku").containsMany()).isTrue();
assertThat(beanType.expressionPath("details.product.sku").containsMany()).isTrue();
}
@Test
public void containsMany_when_one() throws Exception {
BeanType<Order> beanType = beanType(Order.class);
assertThat(beanType.getExpressionPath("customer.name").containsMany()).isFalse();
assertThat(beanType.expressionPath("customer.name").containsMany()).isFalse();
}
@Test
public void containsMany_when_oneWithMany() throws Exception {
BeanType<Order> beanType = beanType(Order.class);
assertThat(beanType.getExpressionPath("customer.contacts").containsMany()).isTrue();
assertThat(beanType.expressionPath("customer.contacts").containsMany()).isTrue();
}
@Test
public void containsMany_when_oneWithManyChild() throws Exception {
BeanType<Order> beanType = beanType(Order.class);
assertThat(beanType.getExpressionPath("customer.contacts.firstName").containsMany()).isTrue();
assertThat(beanType.expressionPath("customer.contacts.firstName").containsMany()).isTrue();
}
@Test
@@ -65,7 +65,7 @@ public class ExpressionPathTest {
BeanType<Order> beanType = beanType(Order.class);
Order order = new Order();
beanType.getExpressionPath("id").pathSet(order, 42);
beanType.expressionPath("id").pathSet(order, 42);
assertThat(order.getId()).isEqualTo(42);
}
@@ -74,7 +74,7 @@ public class ExpressionPathTest {
BeanType<Order> beanType = beanType(Order.class);
Order order = new Order();
beanType.getExpressionPath("customer.name").pathSet(order, "Rob");
beanType.expressionPath("customer.name").pathSet(order, "Rob");
assertThat(order.getCustomer().getName()).isEqualTo("Rob");
}
@@ -94,7 +94,7 @@ public class ExpressionPathTest {
customer = server.find(Customer.class, customer.getId());
assertThat(customer.getName()).isEqualTo("foo");
customerBeanType.getExpressionPath("name").pathSet(customer, "bar");
customerBeanType.expressionPath("name").pathSet(customer, "bar");
server.save(customer);
customer = server.find(Customer.class, customer.getId());
@@ -108,7 +108,7 @@ public class ExpressionPathTest {
order = server.find(Order.class, order.getId());
ExpressionPath customerNamePath = orderBeanType.getExpressionPath("customer.name");
ExpressionPath customerNamePath = orderBeanType.expressionPath("customer.name");
assertThat(customerNamePath.pathGet(order)).isEqualTo("bar");
customerNamePath.pathSet(order, "baz");
ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java
+8 -8
View File
@@ -27,30 +27,30 @@ public class PropertyTest {
order.setCustomer(customer);
order.setStatus(Order.Status.APPROVED);
Property statusProperty = beanType(Order.class).getProperty("status");
Property statusProperty = beanType(Order.class).property("status");
assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus());
Property customerProperty = beanType(Order.class).getProperty("customer");
Property customerProperty = beanType(Order.class).property("customer");
assertThat(customerProperty.getVal(order)).isEqualTo(customer);
}
@Test
public void isMany_when_not() {
assertThat(beanType(Order.class).getProperty("status").isMany()).isFalse();
assertThat(beanType(Order.class).getProperty("customer").isMany()).isFalse();
assertThat(beanType(Order.class).property("status").isMany()).isFalse();
assertThat(beanType(Order.class).property("customer").isMany()).isFalse();
}
@Test
public void isMany_when_true() {
assertThat(beanType(Order.class).getProperty("details").isMany()).isTrue();
assertThat(beanType(Order.class).property("details").isMany()).isTrue();
}
@Test
public void name() {
assertThat(beanType(Order.class).getProperty("status").getName()).isEqualTo("status");
assertThat(beanType(Order.class).getProperty("customer").getName()).isEqualTo("customer");
assertThat(beanType(Order.class).getProperty("details").getName()).isEqualTo("details");
assertThat(beanType(Order.class).property("status").getName()).isEqualTo("status");
assertThat(beanType(Order.class).property("customer").getName()).isEqualTo("customer");
assertThat(beanType(Order.class).property("details").getName()).isEqualTo("details");
}
}
ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java
+6 -6
View File
@@ -26,12 +26,12 @@ public class SpiServerTest extends BaseTestCase {
SpiServer pluginApi = defaultServer.pluginApi();
BeanType<Customer> beanType = pluginApi.beanType(Customer.class);
assertEquals("o_customer", beanType.getBaseTable());
assertEquals("o_customer", beanType.baseTable());
assertNotNull(pluginApi.databasePlatform());
assertNull(beanType.getFindController());
assertNotNull(beanType.getPersistController());
assertNull(beanType.getPersistListener());
assertNull(beanType.getQueryAdapter());
assertNull(beanType.findController());
assertNotNull(beanType.persistController());
assertNull(beanType.persistListener());
assertNull(beanType.queryAdapter());
assertTrue(beanType.isValidExpression("name"));
assertTrue(beanType.isValidExpression("contacts.firstName"));
@@ -43,7 +43,7 @@ public class SpiServerTest extends BaseTestCase {
Customer customer = new Customer();
customer.setId(42);
assertEquals(42, beanType.beanId(customer));
assertEquals(42, beanType.id(customer));
List<? extends BeanType<?>> beanTypes = pluginApi.beanTypes("o_customer");
assertEquals(2, beanTypes.size());
ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java
+2 -2
View File
@@ -17,7 +17,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase {
BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
DocumentMapping documentMapping = desc.getDocMapping();
DocumentMapping documentMapping = desc.docMapping();
DocPropertyMapping properties = documentMapping.getProperties();
@@ -29,7 +29,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase {
BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
DocumentMapping documentMapping = desc.getDocMapping();
DocumentMapping documentMapping = desc.docMapping();
DocPropertyMapping properties = documentMapping.getProperties();
ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java
+10 -10
View File
@@ -39,42 +39,42 @@ public class BeanDescriptor_registerTest {
Controller1 controller1 = new Controller1();
assertNull(desc.getPersistController());
assertNull(desc.persistController());
desc.register(controller1);
assertSame(controller1, desc.getPersistController());
assertSame(controller1, desc.persistController());
Controller2 controller2 = new Controller2();
desc.register(controller2);
assertEquals(2, ((ChainedBeanPersistController) desc.getPersistController()).size());
assertEquals(2, ((ChainedBeanPersistController) desc.persistController()).size());
desc.deregister(controller1);
assertEquals(1, ((ChainedBeanPersistController) desc.getPersistController()).size());
assertEquals(1, ((ChainedBeanPersistController) desc.persistController()).size());
desc.deregister(controller2);
assertEquals(0, ((ChainedBeanPersistController) desc.getPersistController()).size());
assertEquals(0, ((ChainedBeanPersistController) desc.persistController()).size());
}
private void persistListenerRegistrationTests(BeanDescriptor<EBasic> desc) {
Listener1 listener1 = new Listener1();
assertNull(desc.getPersistListener());
assertNull(desc.persistListener());
desc.register(listener1);
assertSame(listener1, desc.getPersistListener());
assertSame(listener1, desc.persistListener());
Listener2 listener2 = new Listener2();
desc.register(listener2);
BeanPersistListener persistListener = desc.getPersistListener();
BeanPersistListener persistListener = desc.persistListener();
assertTrue(persistListener instanceof ChainedBeanPersistListener);
assertEquals(2, ((ChainedBeanPersistListener) persistListener).size());
desc.deregister(listener1);
assertEquals(1, ((ChainedBeanPersistListener) desc.getPersistListener()).size());
assertEquals(1, ((ChainedBeanPersistListener) desc.persistListener()).size());
desc.deregister(listener2);
assertEquals(0, ((ChainedBeanPersistListener) desc.getPersistListener()).size());
assertEquals(0, ((ChainedBeanPersistListener) desc.persistListener()).size());
}
public static class Listener1 extends AbstractBeanPersistListener {
ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java
+4 -4
View File
@@ -21,15 +21,15 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase {
BeanDescriptor<Customer> desc = server.getBeanDescriptor(Customer.class);
BeanProperty whenCreatedProperty = desc.getWhenCreatedProperty();
BeanProperty whenCreatedProperty = desc.whenCreatedProperty();
assertEquals("cretime", whenCreatedProperty.getDbColumn());
BeanProperty whenModifiedProperty = desc.getWhenModifiedProperty();
BeanProperty whenModifiedProperty = desc.whenModifiedProperty();
assertEquals("updtime", whenModifiedProperty.getDbColumn());
BeanDescriptor<EBasic> eBasicDesc = server.getBeanDescriptor(EBasic.class);
assertNull(eBasicDesc.getWhenCreatedProperty());
assertNull(eBasicDesc.getWhenModifiedProperty());
assertNull(eBasicDesc.whenCreatedProperty());
assertNull(eBasicDesc.whenModifiedProperty());
}
}
ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
public void testHasId() {
BeanDescriptor<Order> beanDescriptor = spiServer.getBeanDescriptor(Order.class);
assertNotNull(beanDescriptor.getIdProperty());
assertEquals("id", beanDescriptor.getIdProperty().getName());
assertNotNull(beanDescriptor.idProperty());
assertEquals("id", beanDescriptor.idProperty().getName());
assertNotNull(beanDescriptor.getVersionProperty());
assertEquals("updtime", beanDescriptor.getVersionProperty().getName());
ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class TestDPersonEl {
EntityBean entityBean = (EntityBean) p;
ExpressionPath elSalary = descriptor.getExpressionPath("salary");
ExpressionPath elSalary = descriptor.expressionPath("salary");
Object money = elSalary.pathGet(entityBean);
ebean-core/src/test/java/org/tests/el/TestPathExpression.java
+10 -10
View File
@@ -22,9 +22,9 @@ public class TestPathExpression {
public TestPathExpression() {
SpiServer server = DB.getDefault().pluginApi();
beanType = server.beanType(Customer.class);
billingId = beanType.getExpressionPath("billingAddress.id");
line1 = beanType.getExpressionPath("billingAddress.line1");
city = beanType.getExpressionPath("billingAddress.city");
billingId = beanType.expressionPath("billingAddress.id");
line1 = beanType.expressionPath("billingAddress.line1");
city = beanType.expressionPath("billingAddress.city");
}
@Test
@@ -35,11 +35,11 @@ public class TestPathExpression {
city.pathSet(c1, "Auckland");
billingId.pathSet(c1, 4);
beanType.getExpressionPath("id").pathSet(c1, 42L);
beanType.getExpressionPath("name").pathSet(c1, "jimmy");
beanType.getExpressionPath("status").pathSet(c1, "ACTIVE");
beanType.getExpressionPath("billingAddress.country.code").pathSet(c1, "NZ");
beanType.getExpressionPath("billingAddress.country.name").pathSet(c1, "New Zealand");
beanType.expressionPath("id").pathSet(c1, 42L);
beanType.expressionPath("name").pathSet(c1, "jimmy");
beanType.expressionPath("status").pathSet(c1, "ACTIVE");
beanType.expressionPath("billingAddress.country.code").pathSet(c1, "NZ");
beanType.expressionPath("billingAddress.country.name").pathSet(c1, "New Zealand");
assertEquals(c1.getId(), Integer.valueOf(42));
@@ -75,7 +75,7 @@ public class TestPathExpression {
assertEquals(billingId.pathGet(e0), Integer.valueOf("12"));
assertEquals(beanType.getExpressionPath("billingAddress.country.code").pathGet(e0), "NZ");
assertEquals(beanType.getExpressionPath("billingAddress.country.name").pathGet(e0), "New Zealand");
assertEquals(beanType.expressionPath("billingAddress.country.code").pathGet(e0), "NZ");
assertEquals(beanType.expressionPath("billingAddress.country.name").pathGet(e0), "New Zealand");
}
}
ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
EAddr addr = new EAddr("Foo", "Bar", nz);
EPerAddr perAddr = new EPerAddr("Embed", addr);
Property country = embType.getProperty("country");
Property country = embType.property("country");
Object val = country.getVal(addr);
assertThat(val).isSameAs(nz);
ebean-core/src/test/java/org/tests/types/TestNewTypes.java
+16 -16
View File
@@ -217,22 +217,22 @@ public class TestNewTypes extends BaseTestCase {
private void testSetGetPath(SomeNewTypesBean refBean) {
SomeNewTypesBean testBean = new SomeNewTypesBean();
BeanType<SomeNewTypesBean> beanType = DB.getDefault().pluginApi().beanType(SomeNewTypesBean.class);
ExpressionPath localDate = beanType.getExpressionPath("localDate");
ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime");
ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime");
ExpressionPath zonedDateTime = beanType.getExpressionPath("zonedDateTime");
ExpressionPath localTime = beanType.getExpressionPath("localTime");
ExpressionPath instant = beanType.getExpressionPath("instant");
ExpressionPath year = beanType.getExpressionPath("year");
ExpressionPath month = beanType.getExpressionPath("month");
ExpressionPath dayOfWeek = beanType.getExpressionPath("dayOfWeek");
ExpressionPath zoneId = beanType.getExpressionPath("zoneId");
ExpressionPath zoneOffset = beanType.getExpressionPath("zoneOffset");
ExpressionPath yearMonth = beanType.getExpressionPath("yearMonth");
ExpressionPath monthDay = beanType.getExpressionPath("monthDay");
ExpressionPath path = beanType.getExpressionPath("path");
ExpressionPath period = beanType.getExpressionPath("period");
ExpressionPath duration = beanType.getExpressionPath("duration");
ExpressionPath localDate = beanType.expressionPath("localDate");
ExpressionPath localDateTime = beanType.expressionPath("localDateTime");
ExpressionPath offsetDateTime = beanType.expressionPath("offsetDateTime");
ExpressionPath zonedDateTime = beanType.expressionPath("zonedDateTime");
ExpressionPath localTime = beanType.expressionPath("localTime");
ExpressionPath instant = beanType.expressionPath("instant");
ExpressionPath year = beanType.expressionPath("year");
ExpressionPath month = beanType.expressionPath("month");
ExpressionPath dayOfWeek = beanType.expressionPath("dayOfWeek");
ExpressionPath zoneId = beanType.expressionPath("zoneId");
ExpressionPath zoneOffset = beanType.expressionPath("zoneOffset");
ExpressionPath yearMonth = beanType.expressionPath("yearMonth");
ExpressionPath monthDay = beanType.expressionPath("monthDay");
ExpressionPath path = beanType.expressionPath("path");
ExpressionPath period = beanType.expressionPath("period");
ExpressionPath duration = beanType.expressionPath("duration");
localDate.pathSet(testBean, refBean.getLocalDate());
assertThat(localDate.pathGet(testBean)).isEqualTo(refBean.getLocalDate());