From ed5421ea9af1dbe45f91e96a079c4c04eecfbe3e Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 8 Mar 2018 11:48:47 +0100 Subject: [PATCH] Help the Java 6 compiler with type inference & avoid JDK 7 API --- jOOQ/src/main/java/org/jooq/impl/AbstractContext.java | 2 +- .../main/java/org/jooq/impl/DefaultDiagnosticsContext.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/ParserImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java index 06473655b6..44cd9c2045 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java @@ -851,7 +851,7 @@ abstract class AbstractContext> extends AbstractScope imple int size = scopeLevel + 1; if (list.size() < size) - list.addAll(Collections.nCopies(size - list.size(), null)); + list.addAll(Collections.nCopies(size - list.size(), null)); ScopeStackElement result = null; for (int i = scopeLevel; i >= 0 && result == null; i--) diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsContext.java index c53017c92f..de71f800f5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDiagnosticsContext.java @@ -71,8 +71,8 @@ final class DefaultDiagnosticsContext implements DiagnosticsContext { DefaultDiagnosticsContext(String actualStatement, String normalisedStatement, Set duplicateStatements, List 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.emptySet() : duplicateStatements; + this.repeatedStatements = repeatedStatements == null ? Collections.emptyList() : repeatedStatements; } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 0006772028..2788be7e1c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -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;