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

[#3526] Unnecessary warning logs introduced in code generation

Browse Source
This commit is contained in:
Lukas Eder 2014-08-11 11:20:19 +02:00
parent 8490fd669d
commit 16e5bda435
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
View File

@ -869,16 +869,6 @@ public abstract class AbstractDatabase implements Database {
}
}
for (Filter filter : filters) {
if (filter.exclude(definition)) {
if (log.isDebugEnabled())
log.debug("Exclude", "Excluding " + definition.getQualifiedName() + " because of filter " + filter);
continue definitionsLoop;
}
}
if (includes != null) {
for (String include : includes) {
Pattern p = Pattern.compile(include, Pattern.COMMENTS);
@ -887,6 +877,19 @@ public abstract class AbstractDatabase implements Database {
(p.matcher(definition.getName()).matches() ||
p.matcher(definition.getQualifiedName()).matches())) {
// [#3488] This allows for filtering out additional objects, in case the applicable
// code generation configuration might cause conflicts in resulting code
// [#3526] Filters should be applied last, after <exclude/> and <include/>
for (Filter filter : filters) {
if (filter.exclude(definition)) {
if (log.isDebugEnabled())
log.debug("Exclude", "Excluding " + definition.getQualifiedName() + " because of filter " + filter);
continue definitionsLoop;
}
}
result.add(definition);
if (log.isDebugEnabled())