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

[#5457] "overriding method fields in class AbstractRecord" compilation error when using ScalaGenerator on tables containing columns like "fields", "configuration", etc.

Browse Source
This commit is contained in:
lukaseder 2016-07-25 11:23:00 +02:00
parent 7528b7645f
commit 2ae8460ef0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
View File

@ -43,6 +43,7 @@ package org.jooq.util;
import static org.jooq.util.GenerationUtil.convertToIdentifier;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
@ -234,9 +235,8 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
* class hierarchy of a generated class
*/
private Set<String> reservedColumns(Class<?> clazz) {
if (clazz == null) {
if (clazz == null)
return Collections.emptySet();
}
Set<String> result = reservedColumns.get(clazz);
@ -246,17 +246,18 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
// Recurse up in class hierarchy
result.addAll(reservedColumns(clazz.getSuperclass()));
for (Class<?> c : clazz.getInterfaces()) {
for (Class<?> c : clazz.getInterfaces())
result.addAll(reservedColumns(c));
}
for (Method m : clazz.getDeclaredMethods()) {
String name = m.getName();
for (Method m : clazz.getDeclaredMethods())
if (m.getParameterTypes().length == 0)
result.add(m.getName());
if (name.startsWith("get") && m.getParameterTypes().length == 0) {
result.add(name);
}
}
// [#5457] In Scala, we must not "override" any inherited members, even if they're private
// or package private, and thus not visible
if (language == Language.SCALA)
for (Field f : clazz.getDeclaredFields())
result.add(f.getName());
}
return result;