github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#11123] Add Settings.mapConstructorProperties to allow for opting out of reading the ConstructorProperties annotation in DefaultRecordMapper

Browse Source
This commit is contained in:
Lukas Eder 2020-12-14 12:15:52 +01:00
parent 98e4f3b7d8
commit 9071ec2335
3 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jOOQ/src/main/java/org/jooq/conf/Settings.java
View File

@ -190,6 +190,8 @@ public class Settings
protected Boolean returnRecordToPojo = true;
@XmlElement(defaultValue = "true")
protected Boolean mapJPAAnnotations = true;
@XmlElement(defaultValue = "true")
protected Boolean mapConstructorPropertiesParameterNames = true;
@XmlElement(defaultValue = "false")
protected Boolean mapConstructorParameterNames = false;
@XmlElement(defaultValue = "true")
@ -1723,6 +1725,30 @@ public class Settings
this.mapJPAAnnotations = value;
}
/**
* Whether constructor parameter names obtained from the {@link java.beans.ConstructorProperties} annotation should be considered by the DefaultRecordMapper.
*
* @return
* possible object is
* {@link Boolean }
*
*/
public Boolean isMapConstructorPropertiesParameterNames() {
return mapConstructorPropertiesParameterNames;
}
/**
* Sets the value of the mapConstructorPropertiesParameterNames property.
*
* @param value
* allowed object is
* {@link Boolean }
*
*/
public void setMapConstructorPropertiesParameterNames(Boolean value) {
this.mapConstructorPropertiesParameterNames = value;
}
/**
* Whether constructor parameter names obtained via reflection in Java 8+ should be considered by the DefaultRecordMapper. This flag has no effect in Java 6 or 7.
*
@ -3008,6 +3034,11 @@ public class Settings
return this;
}
public Settings withMapConstructorPropertiesParameterNames(Boolean value) {
setMapConstructorPropertiesParameterNames(value);
return this;
}
public Settings withMapConstructorParameterNames(Boolean value) {
setMapConstructorParameterNames(value);
return this;
@ -3414,6 +3445,7 @@ public class Settings
builder.append("returnAllOnUpdatableRecord", returnAllOnUpdatableRecord);
builder.append("returnRecordToPojo", returnRecordToPojo);
builder.append("mapJPAAnnotations", mapJPAAnnotations);
builder.append("mapConstructorPropertiesParameterNames", mapConstructorPropertiesParameterNames);
builder.append("mapConstructorParameterNames", mapConstructorParameterNames);
builder.append("mapConstructorParameterNamesInKotlin", mapConstructorParameterNamesInKotlin);
builder.append("queryPoolable", queryPoolable);
@ -4043,6 +4075,15 @@ public class Settings
return false;
}
}
if (mapConstructorPropertiesParameterNames == null) {
if (other.mapConstructorPropertiesParameterNames!= null) {
return false;
}
} else {
if (!mapConstructorPropertiesParameterNames.equals(other.mapConstructorPropertiesParameterNames)) {
return false;
}
}
if (mapConstructorParameterNames == null) {
if (other.mapConstructorParameterNames!= null) {
return false;
@ -4482,6 +4523,7 @@ public class Settings
result = ((prime*result)+((returnAllOnUpdatableRecord == null)? 0 :returnAllOnUpdatableRecord.hashCode()));
result = ((prime*result)+((returnRecordToPojo == null)? 0 :returnRecordToPojo.hashCode()));
result = ((prime*result)+((mapJPAAnnotations == null)? 0 :mapJPAAnnotations.hashCode()));
result = ((prime*result)+((mapConstructorPropertiesParameterNames == null)? 0 :mapConstructorPropertiesParameterNames.hashCode()));
result = ((prime*result)+((mapConstructorParameterNames == null)? 0 :mapConstructorParameterNames.hashCode()));
result = ((prime*result)+((mapConstructorParameterNamesInKotlin == null)? 0 :mapConstructorParameterNamesInKotlin.hashCode()));
result = ((prime*result)+((queryPoolable == null)? 0 :queryPoolable.hashCode()));

17
jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
View File

@ -415,15 +415,16 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
}
});
// [#1837] If any java.beans.ConstructorProperties annotations are
// present use those rather than matching constructors by the number of
// arguments
for (Constructor<E> constructor : constructors) {
ConstructorProperties properties = constructor.getAnnotation(ConstructorProperties.class);
// [#1837] [#10349] [#11123] If any java.beans.ConstructorProperties annotations are
// present use those rather than matching constructors by the number of arguments
if (!FALSE.equals(configuration.settings().isMapConstructorPropertiesParameterNames())) {
for (Constructor<E> constructor : constructors) {
ConstructorProperties properties = constructor.getAnnotation(ConstructorProperties.class);
if (properties != null) {
delegate = new ImmutablePOJOMapperWithParameterNames(constructor, Arrays.asList(properties.value()), true);
return;
if (properties != null) {
delegate = new ImmutablePOJOMapperWithParameterNames(constructor, Arrays.asList(properties.value()), true);
return;
}
}
}

4
jOOQ/src/main/resources/xsd/jooq-runtime-3.15.0.xsd
View File

@ -424,6 +424,10 @@ IDENTITY values, and if <returnAllOnUpdatableRecord/> is active, also other valu
<element name="mapJPAAnnotations" type="boolean" minOccurs="0" maxOccurs="1" default="true">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether JPA annotations should be considered by the DefaultRecordMapper.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>
<element name="mapConstructorPropertiesParameterNames" type="boolean" minOccurs="0" maxOccurs="1" default="true">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether constructor parameter names obtained from the {@link java.beans.ConstructorProperties} annotation should be considered by the DefaultRecordMapper.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>
<element name="mapConstructorParameterNames" type="boolean" minOccurs="0" maxOccurs="1" default="false">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether constructor parameter names obtained via reflection in Java 8+ should be considered by the DefaultRecordMapper. This flag has no effect in Java 6 or 7.]]></jxb:javadoc></jxb:property></appinfo></annotation>