mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
#2736 - findDto nonsupport setter chain (accessor style setters, both fluid style and non fluid style)
This commit is contained in:
1 parent
745fbe883e
commit
52e6c0c625
3 files changed
+178
-51
No files matched your search
@@ -46,20 +46,29 @@ final class DtoMetaBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static String propertyName(String methodName) {
|
static String propertyName(String methodName) {
|
||||||
final String name = methodName.substring(3);
|
if (isTraditionalSetterMethod(methodName)) {
|
||||||
return Character.toLowerCase(name.charAt(0)) + name.substring(1);
|
final String name = methodName.substring(3);
|
||||||
|
return Character.toLowerCase(name.charAt(0)) + name.substring(1);
|
||||||
|
} else {
|
||||||
|
// accessor style setter method
|
||||||
|
return methodName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isTraditionalSetterMethod(String methodName) {
|
||||||
|
return methodName.startsWith("set") && methodName.length() > 3 && Character.isUpperCase(methodName.charAt(3));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Include a public "setter" method - 1 argument, returns void.
|
* Include a public "setter" method - 1 argument, returns void.
|
||||||
*/
|
*/
|
||||||
static boolean includeMethod(Method method) {
|
static boolean includeMethod(Method method) {
|
||||||
|
String name = method.getName();
|
||||||
final int modifiers = method.getModifiers();
|
final int modifiers = method.getModifiers();
|
||||||
return Modifier.isPublic(modifiers)
|
return Modifier.isPublic(modifiers)
|
||||||
&& !Modifier.isStatic(modifiers)
|
&& !Modifier.isStatic(modifiers)
|
||||||
&& Void.TYPE.equals(method.getReturnType())
|
|
||||||
&& method.getParameterTypes().length == 1
|
&& method.getParameterTypes().length == 1
|
||||||
&& method.getName().startsWith("set") && method.getName().length() > 3;
|
&& (!name.equals("wait") && !name.equals("equals"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void readConstructors() {
|
private void readConstructors() {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package io.ebeaninternal.server.dto;
|
package io.ebeaninternal.server.dto;
|
||||||
|
|
||||||
import org.assertj.core.api.Assertions;
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
@@ -12,42 +11,54 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||||||
public class DtoMetaBuilderTest {
|
public class DtoMetaBuilderTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void includeMethod() {
|
void includeMethod() {
|
||||||
Map<String, Method> methods = getIncludedMethodsFor(D0.class);
|
Map<String, Method> methods = getIncludedMethodsFor(D0.class);
|
||||||
|
|
||||||
assertThat(methods).hasSize(2);
|
assertThat(methods).hasSize(2);
|
||||||
assertThat(methods.get("setName")).isNotNull();
|
assertThat(methods).containsKeys("setId", "setName");
|
||||||
assertThat(methods.get("setId")).isNotNull();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void includeMethod_when_notStrictlySetters() {
|
void includeMethod_when_notStrictlySetters() {
|
||||||
Map<String, Method> methods = getIncludedMethodsFor(D1.class);
|
Map<String, Method> methods = getIncludedMethodsFor(D1.class);
|
||||||
|
|
||||||
assertThat(methods).hasSize(3);
|
assertThat(methods).hasSize(5);
|
||||||
assertThat(methods.get("setNameThen")).isNotNull();
|
assertThat(methods).containsKeys("setNameThen", "setIdFor", "setI", "setA", "set");
|
||||||
assertThat(methods.get("setIdFor")).isNotNull();
|
|
||||||
assertThat(methods.get("setI")).isNotNull();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void propertyType() {
|
void includeMethod_when_fluidAccessors() {
|
||||||
|
Map<String, Method> methods = getIncludedMethodsFor(D2FluidAccessors.class);
|
||||||
|
|
||||||
|
assertThat(methods).hasSize(5);
|
||||||
|
assertThat(methods).containsKeys("nameThen", "idFor", "a", "i", "set");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void includeMethod_when_plainAccessors() {
|
||||||
|
Map<String, Method> methods = getIncludedMethodsFor(D2PlainAccessors.class);
|
||||||
|
|
||||||
|
assertThat(methods).hasSize(5);
|
||||||
|
assertThat(methods).containsKeys("nameThen", "idFor", "a", "i", "set");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void propertyType() {
|
||||||
Map<String, Method> methods = getIncludedMethodsFor(D0.class);
|
Map<String, Method> methods = getIncludedMethodsFor(D0.class);
|
||||||
|
|
||||||
assertThat(methods).hasSize(2);
|
assertThat(methods).hasSize(2);
|
||||||
Assertions.assertThat(DtoMetaProperty.propertyClass(methods.get("setName"))).isEqualTo(String.class);
|
assertThat(DtoMetaProperty.propertyClass(methods.get("setName"))).isEqualTo(String.class);
|
||||||
assertThat(DtoMetaProperty.propertyClass(methods.get("setId"))).isEqualTo(long.class);
|
assertThat(DtoMetaProperty.propertyClass(methods.get("setId"))).isEqualTo(long.class);
|
||||||
assertThat(DtoMetaProperty.propertyType(methods.get("setName"))).isEqualTo(String.class);
|
assertThat(DtoMetaProperty.propertyType(methods.get("setName"))).isEqualTo(String.class);
|
||||||
assertThat(DtoMetaProperty.propertyType(methods.get("setId"))).isEqualTo(long.class);
|
assertThat(DtoMetaProperty.propertyType(methods.get("setId"))).isEqualTo(long.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void propertyName() {
|
void propertyName() {
|
||||||
|
assertThat(DtoMetaBuilder.propertyName("setName")).isEqualTo("name");
|
||||||
Assertions.assertThat(DtoMetaBuilder.propertyName("setName")).isEqualTo("name");
|
|
||||||
assertThat(DtoMetaBuilder.propertyName("setId")).isEqualTo("id");
|
assertThat(DtoMetaBuilder.propertyName("setId")).isEqualTo("id");
|
||||||
assertThat(DtoMetaBuilder.propertyName("setI")).isEqualTo("i");
|
assertThat(DtoMetaBuilder.propertyName("setI")).isEqualTo("i");
|
||||||
assertThat(DtoMetaBuilder.propertyName("setfoo")).isEqualTo("foo");
|
assertThat(DtoMetaBuilder.propertyName("setFoo")).isEqualTo("foo");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -120,4 +131,47 @@ public class DtoMetaBuilderTest {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
static class D2FluidAccessors {
|
||||||
|
|
||||||
|
public D2FluidAccessors nameThen(String name) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public D2FluidAccessors idFor(long id) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public D2FluidAccessors i(long val) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public D2FluidAccessors set(long val) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public D2FluidAccessors a(long val) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
static class D2PlainAccessors {
|
||||||
|
|
||||||
|
public void nameThen(String name) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void idFor(long id) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void i(long val) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void set(long val) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void a(long val) {
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -24,12 +24,36 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
private static final Logger log = LoggerFactory.getLogger(DtoQuery2Test.class);
|
private static final Logger log = LoggerFactory.getLogger(DtoQuery2Test.class);
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findList_constructorMatch() {
|
void dto_findList_fluidAccessors() {
|
||||||
|
ResetBasicData.reset();
|
||||||
|
|
||||||
|
List<DCustFluidAccessors> list = server().findDto(DCustFluidAccessors.class, "select id, name from o_customer").findList();
|
||||||
|
|
||||||
|
assertThat(list).isNotEmpty();
|
||||||
|
for (DCustFluidAccessors cust: list) {
|
||||||
|
assertThat(cust.id()).isNotNull();
|
||||||
|
assertThat(cust.name()).isNotNull();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void dto_findList_plainAccessors() {
|
||||||
|
ResetBasicData.reset();
|
||||||
|
|
||||||
|
List<DCustPlainAccessors> list = server().findDto(DCustPlainAccessors.class, "select id, name from o_customer").findList();
|
||||||
|
|
||||||
|
assertThat(list).isNotEmpty();
|
||||||
|
for (DCustPlainAccessors cust: list) {
|
||||||
|
assertThat(cust.id()).isNotNull();
|
||||||
|
assertThat(cust.name()).isNotNull();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void dto_findList_constructorMatch() {
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
DtoQuery<DCust> dtoQuery = server().findDto(DCust.class, "select id, name from o_customer");
|
DtoQuery<DCust> dtoQuery = server().findDto(DCust.class, "select id, name from o_customer");
|
||||||
|
|
||||||
List<DCust> list = dtoQuery.findList();
|
List<DCust> list = dtoQuery.findList();
|
||||||
|
|
||||||
log.info(list.toString());
|
log.info(list.toString());
|
||||||
@@ -37,7 +61,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findIterator_closeWithResources() {
|
void dto_findIterator_closeWithResources() {
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
int counter = 0;
|
int counter = 0;
|
||||||
@@ -55,7 +79,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findIterator() {
|
void dto_findIterator() {
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
final int expectedCount = server().find(Customer.class).findCount();
|
final int expectedCount = server().find(Customer.class).findCount();
|
||||||
|
|
||||||
@@ -80,7 +104,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findStream() {
|
void dto_findStream() {
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
final int expectedCount = server().find(Customer.class).findCount();
|
final int expectedCount = server().find(Customer.class).findCount();
|
||||||
|
|
||||||
@@ -104,8 +128,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findEach_constructorMatch() {
|
void dto_findEach_constructorMatch() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
LoggedSql.start();
|
LoggedSql.start();
|
||||||
@@ -118,8 +141,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findEachWhile_constructorMatch() {
|
void dto_findEachWhile_constructorMatch() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
LoggedSql.start();
|
LoggedSql.start();
|
||||||
@@ -135,8 +157,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findOneEmpty() {
|
void dto_findOneEmpty() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
Optional<DCust> rob = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
|
Optional<DCust> rob = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
|
||||||
@@ -153,8 +174,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findOne() {
|
void dto_findOne() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
DCust fiona = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
|
DCust fiona = server().findDto(DCust.class, "select id, name from o_customer where name = :name")
|
||||||
@@ -172,8 +192,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_queryPlanHits() {
|
void dto_queryPlanHits() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
resetAllMetrics();
|
resetAllMetrics();
|
||||||
@@ -218,8 +237,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findList_relaxedMode() {
|
void dto_findList_relaxedMode() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
List<DCust2> list = server().findDto(DCust2.class, "select id, '42' as something_we_cannot_map, name from o_customer")
|
List<DCust2> list = server().findDto(DCust2.class, "select id, '42' as something_we_cannot_map, name from o_customer")
|
||||||
@@ -231,8 +249,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findList_relaxedMode_defaultConstructor() {
|
void dto_findList_relaxedMode_defaultConstructor() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
List<DCust2> list = server().findDto(DCust2.class, "select id, '42' as something_we_cannot_map, name from o_customer")
|
List<DCust2> list = server().findDto(DCust2.class, "select id, '42' as something_we_cannot_map, name from o_customer")
|
||||||
@@ -244,8 +261,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findList_constructorPlusMatch() {
|
void dto_findList_constructorPlusMatch() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
String sql = "select c.id, c.name, count(o.id) as totalOrders\n" +
|
String sql = "select c.id, c.name, count(o.id) as totalOrders\n" +
|
||||||
@@ -263,8 +279,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto_findList_setters() {
|
void dto_findList_setters() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
DtoQuery<DCust2> dtoQuery = server().findDto(DCust2.class, "select id, name from o_customer");
|
DtoQuery<DCust2> dtoQuery = server().findDto(DCust2.class, "select id, name from o_customer");
|
||||||
@@ -275,8 +290,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto3_findList_constructorMatch() {
|
void dto3_findList_constructorMatch() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
List<DCust3> robs = server().findDto(DCust3.class, "select id, name, 42 as totalOrders from o_customer where name like ?")
|
List<DCust3> robs = server().findDto(DCust3.class, "select id, name, 42 as totalOrders from o_customer where name like ?")
|
||||||
@@ -290,8 +304,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void dto3_findList_settersMatch() {
|
void dto3_findList_settersMatch() {
|
||||||
|
|
||||||
ResetBasicData.reset();
|
ResetBasicData.reset();
|
||||||
|
|
||||||
List<DCust3> robs = server().findDto(DCust3.class, "select id, name from o_customer where name = :name")
|
List<DCust3> robs = server().findDto(DCust3.class, "select id, name from o_customer where name = :name")
|
||||||
@@ -305,9 +318,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
public static class DCust {
|
public static class DCust {
|
||||||
|
|
||||||
final Integer id;
|
final Integer id;
|
||||||
|
|
||||||
final String name;
|
final String name;
|
||||||
|
|
||||||
int totalOrders;
|
int totalOrders;
|
||||||
|
|
||||||
public DCust(Integer id, String name) {
|
public DCust(Integer id, String name) {
|
||||||
@@ -340,7 +351,6 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
public static class DCust2 {
|
public static class DCust2 {
|
||||||
|
|
||||||
Integer id;
|
Integer id;
|
||||||
|
|
||||||
String name;
|
String name;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -368,9 +378,7 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
public static class DCust3 {
|
public static class DCust3 {
|
||||||
|
|
||||||
Integer id;
|
Integer id;
|
||||||
|
|
||||||
String name;
|
String name;
|
||||||
|
|
||||||
int totalOrders;
|
int totalOrders;
|
||||||
|
|
||||||
public DCust3() {
|
public DCust3() {
|
||||||
@@ -411,4 +419,60 @@ public class DtoQuery2Test extends BaseTestCase {
|
|||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class DCustFluidAccessors {
|
||||||
|
|
||||||
|
Integer id;
|
||||||
|
String name;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "id:" + id + " name:" + name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer id() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DCustFluidAccessors id(Integer id) {
|
||||||
|
this.id = id;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String name() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DCustFluidAccessors name(String name) {
|
||||||
|
this.name = name;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class DCustPlainAccessors {
|
||||||
|
|
||||||
|
Integer id;
|
||||||
|
String name;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "id:" + id + " name:" + name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer id() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void id(Integer id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String name() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void name(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user