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

[jOOQ/jOOQ#10267] ImmutablePOJOMapperWithParameterNames throws

Browse Source 
InaccessibleObjectException on module path
This commit is contained in:
Lukas Eder 2020-07-02 10:36:25 +02:00
parent 4924dfcb89
commit bbcc30ac76
4 changed files with 77 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,8 +709,8 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
// Annotations are available and present
if (useAnnotations) {
members[i] = getAnnotatedMembers(configuration, type, name);
methods[i] = getAnnotatedSetters(configuration, type, name);
members[i] = getAnnotatedMembers(configuration, type, name, true);
methods[i] = getAnnotatedSetters(configuration, type, name, true);
}
// No annotations are present
@ -744,8 +744,8 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
// A top-level mapping is applied
else {
members[i] = getMatchingMembers(configuration, type, name);
methods[i] = getMatchingSetters(configuration, type, name);
members[i] = getMatchingMembers(configuration, type, name, true);
methods[i] = getMatchingSetters(configuration, type, name, true);
}
}
}
@ -755,14 +755,14 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
String prefix = entry.getKey();
List<RecordMapper<Record, Object>> list = new ArrayList<>();
for (java.lang.reflect.Field member : getMatchingMembers(configuration, type, prefix)) {
for (java.lang.reflect.Field member : getMatchingMembers(configuration, type, prefix, true)) {
list.add(configuration
.recordMapperProvider()
.provide(new Fields<>(entry.getValue()), member.getType())
);
}
for (Method method : getMatchingSetters(configuration, type, prefix)) {
for (Method method : getMatchingSetters(configuration, type, prefix, true)) {
list.add(configuration
.recordMapperProvider()
.provide(new Fields<>(entry.getValue()), method.getParameterTypes()[0])
@ -830,14 +830,14 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
Object value = mapper.map(rec);
for (java.lang.reflect.Field member : getMatchingMembers(configuration, type, prefix)) {
for (java.lang.reflect.Field member : getMatchingMembers(configuration, type, prefix, true)) {
// [#935] Avoid setting final fields
if ((member.getModifiers() & Modifier.FINAL) == 0)
map(value, result, member);
}
for (Method method : getMatchingSetters(configuration, type, prefix))
for (Method method : getMatchingSetters(configuration, type, prefix, true))
method.invoke(result, value);
}
}
@ -1053,14 +1053,14 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
// Annotations are available and present
if (useAnnotations) {
members[i] = getAnnotatedMembers(configuration, type, name);
methods[i] = getAnnotatedGetter(configuration, type, name);
members[i] = getAnnotatedMembers(configuration, type, name, false);
methods[i] = getAnnotatedGetter(configuration, type, name, true);
}
// No annotations are present
else {
members[i] = getMatchingMembers(configuration, type, name);
methods[i] = getMatchingGetter(configuration, type, name);
members[i] = getMatchingMembers(configuration, type, name, false);
methods[i] = getMatchingGetter(configuration, type, name, true);
}
// [#3911] Liberal interpretation of the @ConstructorProperties specs:

8
jOOQ/src/main/java/org/jooq/impl/DefaultRecordUnmapper.java
View File

@ -244,14 +244,14 @@ public class DefaultRecordUnmapper<E, R extends Record> implements RecordUnmappe
// Annotations are available and present
if (useAnnotations) {
members = getAnnotatedMembers(configuration, type, field.getName());
method = getAnnotatedGetter(configuration, type, field.getName());
members = getAnnotatedMembers(configuration, type, field.getName(), true);
method = getAnnotatedGetter(configuration, type, field.getName(), true);
}
// No annotations are present
else {
members = getMatchingMembers(configuration, type, field.getName());
method = getMatchingGetter(configuration, type, field.getName());
members = getMatchingMembers(configuration, type, field.getName(), true);
method = getMatchingGetter(configuration, type, field.getName(), true);
}
// Use only the first applicable method or member

86
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -157,9 +157,9 @@ import static org.jooq.impl.Tools.DataCacheKey.DATA_REFLECTION_CACHE_GET_MATCHIN
import static org.jooq.impl.Tools.DataCacheKey.DATA_REFLECTION_CACHE_HAS_COLUMN_ANNOTATIONS;
import static org.jooq.impl.Tools.DataKey.DATA_BLOCK_NESTING;
import static org.jooq.tools.StringUtils.defaultIfNull;
import static org.jooq.tools.reflect.Reflect.accessible;
import java.io.Serializable;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@ -3444,10 +3444,19 @@ final class Tools {
}, DATA_REFLECTION_CACHE_HAS_COLUMN_ANNOTATIONS, type);
}
static final <T extends AccessibleObject> T accessible(T object, boolean makeAccessible) {
return makeAccessible ? Reflect.accessible(object) : object;
}
/**
* Get all members annotated with a given column name
*/
static final List<java.lang.reflect.Field> getAnnotatedMembers(final Configuration configuration, final Class<?> type, final String name) {
static final List<java.lang.reflect.Field> getAnnotatedMembers(
final Configuration configuration,
final Class<?> type,
final String name,
final boolean makeAccessible
) {
return Cache.run(configuration, new F0<List<java.lang.reflect.Field>>() {
@Override
@ -3459,7 +3468,7 @@ final class Tools {
if (column != null) {
if (namesMatch(name, column.name()))
result.add(accessible(member));
result.add(accessible(member, makeAccessible));
}
else {
@ -3467,7 +3476,7 @@ final class Tools {
if (id != null)
if (namesMatch(name, member.getName()))
result.add(accessible(member));
result.add(accessible(member, makeAccessible));
}
}
@ -3488,7 +3497,12 @@ final class Tools {
/**
* Get all members matching a given column name
*/
static final List<java.lang.reflect.Field> getMatchingMembers(final Configuration configuration, final Class<?> type, final String name) {
static final List<java.lang.reflect.Field> getMatchingMembers(
final Configuration configuration,
final Class<?> type,
final String name,
final boolean makeAccessible
) {
return Cache.run(configuration, new F0<List<java.lang.reflect.Field>>() {
@Override
@ -3501,9 +3515,9 @@ final class Tools {
for (java.lang.reflect.Field member : getInstanceMembers(type))
if (name.equals(member.getName()))
result.add(accessible(member));
result.add(accessible(member, makeAccessible));
else if (camelCaseLC.equals(member.getName()))
result.add(accessible(member));
result.add(accessible(member, makeAccessible));
return result;
}
@ -3514,7 +3528,12 @@ final class Tools {
/**
* Get all setter methods annotated with a given column name
*/
static final List<Method> getAnnotatedSetters(final Configuration configuration, final Class<?> type, final String name) {
static final List<Method> getAnnotatedSetters(
final Configuration configuration,
final Class<?> type,
final String name,
final boolean makeAccessible
) {
return Cache.run(configuration, new F0<List<Method>>() {
@Override
@ -3528,7 +3547,7 @@ final class Tools {
// Annotated setter
if (method.getParameterTypes().length == 1) {
set.add(new SourceMethod(accessible(method)));
set.add(new SourceMethod(accessible(method, makeAccessible)));
}
// Annotated getter with matching setter
@ -3548,7 +3567,7 @@ final class Tools {
// Setter annotation is more relevant
if (setter.getAnnotation(Column.class) == null)
set.add(new SourceMethod(accessible(setter)));
set.add(new SourceMethod(accessible(setter, makeAccessible)));
}
catch (NoSuchMethodException ignore) {}
}
@ -3565,7 +3584,12 @@ final class Tools {
/**
* Get the first getter method annotated with a given column name
*/
static final Method getAnnotatedGetter(final Configuration configuration, final Class<?> type, final String name) {
static final Method getAnnotatedGetter(
final Configuration configuration,
final Class<?> type,
final String name,
final boolean makeAccessible
) {
return Cache.run(configuration, new F0<Method>() {
@Override
@ -3577,7 +3601,7 @@ final class Tools {
// Annotated getter
if (method.getParameterTypes().length == 0) {
return accessible(method);
return accessible(method, makeAccessible);
}
// Annotated setter with matching getter
@ -3590,7 +3614,7 @@ final class Tools {
// Getter annotation is more relevant
if (getter.getAnnotation(Column.class) == null)
return accessible(getter);
return accessible(getter, makeAccessible);
}
catch (NoSuchMethodException ignore) {}
@ -3599,7 +3623,7 @@ final class Tools {
// Getter annotation is more relevant
if (getter.getAnnotation(Column.class) == null)
return accessible(getter);
return accessible(getter, makeAccessible);
}
catch (NoSuchMethodException ignore) {}
}
@ -3616,7 +3640,12 @@ final class Tools {
/**
* Get all setter methods matching a given column name
*/
static final List<Method> getMatchingSetters(final Configuration configuration, final Class<?> type, final String name) {
static final List<Method> getMatchingSetters(
final Configuration configuration,
final Class<?> type,
final String name,
final boolean makeAccessible
) {
return Cache.run(configuration, new F0<List<Method>>() {
@Override
@ -3635,13 +3664,13 @@ final class Tools {
if (parameterTypes.length == 1)
if (name.equals(method.getName()))
set.add(new SourceMethod(accessible(method)));
set.add(new SourceMethod(accessible(method, makeAccessible)));
else if (camelCaseLC.equals(method.getName()))
set.add(new SourceMethod(accessible(method)));
set.add(new SourceMethod(accessible(method, makeAccessible)));
else if (("set" + name).equals(method.getName()))
set.add(new SourceMethod(accessible(method)));
set.add(new SourceMethod(accessible(method, makeAccessible)));
else if (("set" + camelCase).equals(method.getName()))
set.add(new SourceMethod(accessible(method)));
set.add(new SourceMethod(accessible(method, makeAccessible)));
}
return SourceMethod.methods(set);
@ -3654,7 +3683,12 @@ final class Tools {
/**
* Get the first getter method matching a given column name
*/
static final Method getMatchingGetter(final Configuration configuration, final Class<?> type, final String name) {
static final Method getMatchingGetter(
final Configuration configuration,
final Class<?> type,
final String name,
final boolean makeAccessible
) {
return Cache.run(configuration, new F0<Method>() {
@Override
@ -3667,17 +3701,17 @@ final class Tools {
for (Method method : getInstanceMethods(type))
if (method.getParameterTypes().length == 0)
if (name.equals(method.getName()))
return accessible(method);
return accessible(method, makeAccessible);
else if (camelCaseLC.equals(method.getName()))
return accessible(method);
return accessible(method, makeAccessible);
else if (("get" + name).equals(method.getName()))
return accessible(method);
return accessible(method, makeAccessible);
else if (("get" + camelCase).equals(method.getName()))
return accessible(method);
return accessible(method, makeAccessible);
else if (("is" + name).equals(method.getName()))
return accessible(method);
return accessible(method, makeAccessible);
else if (("is" + camelCase).equals(method.getName()))
return accessible(method);
return accessible(method, makeAccessible);
return null;
}

1
pom.xml
View File

@ -609,6 +609,7 @@
<module>jOOQ-checker</module>
<module>jOOQ-meta</module>