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

Help the Java 6 compiler with type inference & avoid JDK 7 API

Browse Source
This commit is contained in:
lukaseder 2018-03-08 11:48:47 +01:00
parent dbf7f9d4fc
commit ed5421ea9a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
View File

@ -851,7 +851,7 @@ abstract class AbstractContext<C extends Context<C>> extends AbstractScope imple
int size = scopeLevel + 1;
if (list.size() < size)
list.addAll(Collections.nCopies(size - list.size(), null));
list.addAll(Collections.<ScopeStackElement>nCopies(size - list.size(), null));
ScopeStackElement result = null;
for (int i = scopeLevel; i >= 0 && result == null; i--)

4
jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsContext.java
View File

@ -71,8 +71,8 @@ final class DefaultDiagnosticsContext implements DiagnosticsContext {
DefaultDiagnosticsContext(String actualStatement, String normalisedStatement, Set<String> duplicateStatements, List<String> repeatedStatements) {
this.actualStatement = actualStatement;
this.normalisedStatement = normalisedStatement;
this.duplicateStatements = duplicateStatements == null ? Collections.emptySet() : duplicateStatements;
this.repeatedStatements = repeatedStatements == null ? Collections.emptyList() : repeatedStatements;
this.duplicateStatements = duplicateStatements == null ? Collections.<String>emptySet() : duplicateStatements;
this.repeatedStatements = repeatedStatements == null ? Collections.<String>emptyList() : repeatedStatements;
}
@Override

2
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -7135,7 +7135,7 @@ final class ParserImpl implements Parser {
while (i < ctx.sql.length) {
switch (ctx.sql[i]) {
case '+':
if (!ctx.ignoreHints && i + 1 < ctx.sql.length && Character.isAlphabetic(ctx.sql[i + 1]))
if (!ctx.ignoreHints && i + 1 < ctx.sql.length && ((ctx.sql[i + 1] >= 'A' && ctx.sql[i + 1] <= 'Z') || (ctx.sql[i + 1] >= 'a' && ctx.sql[i + 1] <= 'z')))
break loop;
break;