#2359 - Rename plugin api methods with deprecation - Property

This commit is contained in:
rbygrave
2021-09-08 14:04:31 +12:00
parent bc02eeac57
commit 632f04c76b
66 changed files with 265 additions and 193 deletions
@@ -72,7 +72,7 @@ public class BeanTypeTest {
order.setStatus(Order.Status.APPROVED);
Property statusProperty = beanType(Order.class).property("status");
assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus());
assertThat(statusProperty.value(order)).isEqualTo(order.getStatus());
}
@Test
@@ -28,10 +28,10 @@ public class PropertyTest {
order.setStatus(Order.Status.APPROVED);
Property statusProperty = beanType(Order.class).property("status");
assertThat(statusProperty.getVal(order)).isEqualTo(order.getStatus());
assertThat(statusProperty.value(order)).isEqualTo(order.getStatus());
Property customerProperty = beanType(Order.class).property("customer");
assertThat(customerProperty.getVal(order)).isEqualTo(customer);
assertThat(customerProperty.value(order)).isEqualTo(customer);
}
@Test
@@ -49,8 +49,8 @@ public class PropertyTest {
@Test
public void name() {
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");
assertThat(beanType(Order.class).property("status").name()).isEqualTo("status");
assertThat(beanType(Order.class).property("customer").name()).isEqualTo("customer");
assertThat(beanType(Order.class).property("details").name()).isEqualTo("details");
}
}
@@ -33,10 +33,10 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
BeanDescriptor<Order> beanDescriptor = spiServer.getBeanDescriptor(Order.class);
assertNotNull(beanDescriptor.idProperty());
assertEquals("id", beanDescriptor.idProperty().getName());
assertEquals("id", beanDescriptor.idProperty().name());
assertNotNull(beanDescriptor.getVersionProperty());
assertEquals("updtime", beanDescriptor.getVersionProperty().getName());
assertEquals("updtime", beanDescriptor.getVersionProperty().name());
Order order = new Order();
@@ -32,14 +32,14 @@ public class TestELBasic extends BaseTestCase {
ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id");
assertTrue(elBillAddressId instanceof BeanFkeyProperty);
assertEquals("billing_address_id", elBillAddressId.getDbColumn());
assertEquals("billingAddress.id", elBillAddressId.getName());
assertEquals("billingAddress.id", elBillAddressId.name());
assertNull(elBillAddressId.getElPrefix());
ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city");
assertTrue(elBillAddressCity instanceof ElPropertyChain);
assertEquals("billingAddress", elBillAddressCity.getElPrefix());
assertEquals("city", elBillAddressCity.getName());
assertEquals("city", elBillAddressCity.name());
assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false));
assertEquals("city", elBillAddressCity.getDbColumn());
@@ -52,7 +52,7 @@ public class TestELBasic extends BaseTestCase {
ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status");
assertTrue(elOrderStatus instanceof ElPropertyChain);
assertEquals("orders", elOrderStatus.getElPrefix());
assertEquals("status", elOrderStatus.getName());
assertEquals("status", elOrderStatus.name());
assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false));
assertEquals("status", elOrderStatus.getDbColumn());
@@ -95,8 +95,8 @@ public class TestInsertCheckUnique extends BaseTestCase {
StringBuilder msg = new StringBuilder();
properties.forEach((it)-> {
Object propertyValue = it.getVal(doc2);
String propertyName = it.getName();
Object propertyValue = it.value(doc2);
String propertyName = it.name();
msg.append(" property["+propertyName+"] value["+propertyValue+"]");
});
@@ -30,7 +30,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
EPerAddr perAddr = new EPerAddr("Embed", addr);
Property country = embType.property("country");
Object val = country.getVal(addr);
Object val = country.value(addr);
assertThat(val).isSameAs(nz);