From 4c4c0ebcb2d9f45359cbeafb50a4f9af919fe39f Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 1 Dec 2020 12:49:57 +0100 Subject: [PATCH] [jOOQ/jOOQ#11056] Updated annotations to reflect status quo --- jOOQ/src/main/java/org/jooq/Parser.java | 16 ++++++++-------- jOOQ/src/main/java/org/jooq/impl/ParserImpl.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Parser.java b/jOOQ/src/main/java/org/jooq/Parser.java index 725994086b..ab4629dc03 100644 --- a/jOOQ/src/main/java/org/jooq/Parser.java +++ b/jOOQ/src/main/java/org/jooq/Parser.java @@ -81,7 +81,7 @@ public interface Parser { * @param sql The SQL string * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL Query parseQuery(String sql) throws ParserException; @@ -93,7 +93,7 @@ public interface Parser { * @param bindings The bind variables * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL Query parseQuery(String sql, Object... bindings) throws ParserException; @@ -104,7 +104,7 @@ public interface Parser { * @param sql The SQL string * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL Statement parseStatement(String sql) throws ParserException; @@ -116,7 +116,7 @@ public interface Parser { * @param bindings The bind variables * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL Statement parseStatement(String sql, Object... bindings) throws ParserException; @@ -156,7 +156,7 @@ public interface Parser { * @param sql The SQL string * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL ResultQuery parseResultQuery(String sql) throws ParserException; @@ -168,7 +168,7 @@ public interface Parser { * @param bindings The bind variables * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL ResultQuery parseResultQuery(String sql, Object... bindings) throws ParserException; @@ -179,7 +179,7 @@ public interface Parser { * @param sql The SQL string * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL Select parseSelect(String sql) throws ParserException; @@ -191,7 +191,7 @@ public interface Parser { * @param bindings The bind variables * @throws ParserException If the SQL string could not be parsed. */ - @NotNull + @Nullable @Support @PlainSQL Select parseSelect(String sql, Object... bindings) throws ParserException; diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 7bc7c90a33..589a33978e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -12174,7 +12174,7 @@ final class ParserContext { this.locale = parseLocale(dsl.settings()); this.meta = meta; this.metaLookups = metaLookups; - this.sql = sqlString.toCharArray(); + this.sql = sqlString != null ? sqlString.toCharArray() : new char[0]; this.bindings = bindings; }