From 348447248f74fd0e80691682562d97fcb181f148 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 20 Oct 2014 16:49:52 +0200 Subject: [PATCH] [#3703] Deprecate CastMode.SOME and RenderContext.cast() --- jOOQ/src/main/java/org/jooq/Context.java | 6 ++++++ jOOQ/src/main/java/org/jooq/RenderContext.java | 9 +++++++++ .../java/org/jooq/impl/AbstractContext.java | 9 ++------- jOOQ/src/main/java/org/jooq/impl/Val.java | 17 ----------------- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Context.java b/jOOQ/src/main/java/org/jooq/Context.java index 3d47173267..4e758cf4e3 100644 --- a/jOOQ/src/main/java/org/jooq/Context.java +++ b/jOOQ/src/main/java/org/jooq/Context.java @@ -472,11 +472,17 @@ public interface Context> { * null * * + * + * @deprecated - [#3703] - 3.5.0 - Do not use this any longer */ + @Deprecated Boolean cast(); /** * Set the new cast mode to {@link CastMode#SOME} for a list of dialects. + * + * @deprecated - [#3703] - 3.5.0 - Do not use this any longer */ + @Deprecated C castModeSome(SQLDialect... dialects); } diff --git a/jOOQ/src/main/java/org/jooq/RenderContext.java b/jOOQ/src/main/java/org/jooq/RenderContext.java index 30d24d9518..241b01bcdc 100644 --- a/jOOQ/src/main/java/org/jooq/RenderContext.java +++ b/jOOQ/src/main/java/org/jooq/RenderContext.java @@ -340,13 +340,19 @@ public interface RenderContext extends Context { * null * * + * + * @deprecated - [#3703] - 3.5.0 - Do not use this any longer */ + @Deprecated @Override Boolean cast(); /** * Set the new cast mode to {@link CastMode#SOME} for a list of dialects. + * + * @deprecated - [#3703] - 3.5.0 - Do not use this any longer */ + @Deprecated @Override RenderContext castModeSome(SQLDialect... dialects); @@ -371,7 +377,10 @@ public interface RenderContext extends Context { * Cast bind values only in some dialects. The specified dialects assume * {@link #ALWAYS} behaviour, all the other dialects assume * {@link #NEVER}. + * + * @deprecated - [#3703] - 3.5.0 - Do not use this any longer */ + @Deprecated SOME, /** diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java index d0ac5c58cb..622c4c1ee1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java @@ -40,7 +40,6 @@ */ package org.jooq.impl; -import static java.util.Arrays.asList; import static org.jooq.conf.ParamType.INDEXED; import static org.jooq.impl.Utils.DATA_OMIT_CLAUSE_EVENT_EMISSION; @@ -93,7 +92,6 @@ abstract class AbstractContext> implements Context { ParamType paramType = ParamType.INDEXED; boolean qualify = true; CastMode castMode = CastMode.DEFAULT; - SQLDialect[] castDialects; AbstractContext(Configuration configuration, PreparedStatement stmt) { this.configuration = configuration; @@ -498,28 +496,25 @@ abstract class AbstractContext> implements Context { @Override public final C castMode(CastMode mode) { this.castMode = mode; - this.castDialects = null; return (C) this; } @Override + @Deprecated public final Boolean cast() { switch (castMode) { case ALWAYS: return true; case NEVER: return false; - case SOME: - return asList(castDialects).contains(configuration.dialect()); } return null; } @Override + @Deprecated public final C castModeSome(SQLDialect... dialects) { - this.castMode = CastMode.SOME; - this.castDialects = dialects; return (C) this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java index d0bc32d648..31a4c371c1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Val.java +++ b/jOOQ/src/main/java/org/jooq/impl/Val.java @@ -125,23 +125,6 @@ class Val extends AbstractParam { case ALWAYS: toSQLCast(context); return; - - case SOME: - - // This dialect must cast - if (context.cast()) { - toSQLCast(context); - } - - // In some cases, we should still cast - else if (shouldCast(context)) { - toSQLCast(context); - } - else { - toSQL(context, value, getConverter()); - } - - return; } // See if we "should" cast, to stay on the safe side