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

[#5888] <expressions/> deprecation message is logged several times by the code generator

Browse Source
This commit is contained in:
lukaseder 2017-02-17 22:18:59 +01:00
parent fd7d8e0376
commit c367e0bd45
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -897,6 +897,12 @@ public abstract class AbstractDatabase implements Database {
while (it2.hasNext()) {
ForcedType type = it2.next();
if (type.getExpressions() != null) {
type.setExpression(type.getExpressions());
type.setExpressions(null);
log.warn("DEPRECATED", "The <expressions/> element in <forcedType/> is deprecated. Use <expression/> instead: " + toString(type));
}
if (StringUtils.isBlank(type.getName())) {
if (StringUtils.isBlank(type.getUserType())) {
log.warn("Bad configuration for <forcedType/>. Either <name/> or <userType/> is required: " + toString(type));
@ -1233,13 +1239,7 @@ public abstract class AbstractDatabase implements Database {
public final ForcedType getConfiguredForcedType(Definition definition, DataTypeDefinition definedType) {
forcedTypeLoop:
for (ForcedType forcedType : getConfiguredForcedTypes()) {
String expression = forcedType.getExpression();
if (forcedType.getExpressions() != null) {
expression = forcedType.getExpressions();
log.warn("DEPRECATED", "The <expressions/> element in <forcedType/> is deprecated. Use <expression/> instead");
}
String expression = StringUtils.defaultIfNull(forcedType.getExpressions(), forcedType.getExpression());
String types = forcedType.getTypes();
if (expression != null) {