diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java index d658ab23cb..f42f34ee47 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -3418,31 +3418,6 @@ public class JavaGenerator extends AbstractGenerator { - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java index d9ac86f433..a28796061e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java @@ -73,12 +73,6 @@ public class CatalogDefinition extends AbstractDefinition { return null; } - @SuppressWarnings("deprecation") - @Override - public final String getOutputName() { - return getDatabase().getOutputCatalog(getInputName()); - } - @Override public final List getDefinitionPath() { return asList(this); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java index 2064b4c655..1dd11b0b1f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java @@ -75,15 +75,6 @@ public interface ColumnDefinition extends TypedElementDefinition { - /** - * Bind values from a {@link QueryPart}. This will also increment the - * internal counter. - * - * @throws DataAccessException If something went wrong while binding a - * variable - * @deprecated - 3.2.0 - [#2666] - Use {@link #visit(QueryPart)} instead - */ - @NotNull - @Deprecated - BindContext bind(QueryPart part) throws DataAccessException; - - /** - * Bind values from several {@link QueryPart}'s. This will also increment - * the internal counter. - * - * @throws DataAccessException If something went wrong while binding a - * variable - * @deprecated - 3.2.0 - [#2666] - Use {@link #visit(QueryPart)} instead - */ - @NotNull - @Deprecated - BindContext bind(Collection parts) throws DataAccessException; - - /** - * Bind values from several {@link QueryPart}'s. This will also increment - * the internal counter. - * - * @throws DataAccessException If something went wrong while binding a - * variable - * @deprecated - 3.2.0 - [#2666] - Use {@link #visit(QueryPart)} instead - */ - @NotNull - @Deprecated - BindContext bind(QueryPart[] parts) throws DataAccessException; - - /** - * Bind a value using a specific type. This will also increment the internal - * counter. - * - * @throws DataAccessException If something went wrong while binding a - * variable - * @deprecated - 3.4.0 - [#3114] - Use {@link #bindValue(Object, Field)} instead - */ - @NotNull - @Deprecated - BindContext bindValue(Object value, Class type) throws DataAccessException; - - /** - * Bind several values. This will also increment the internal counter. - * - * @throws DataAccessException If something went wrong while binding a - * variable - * @deprecated - 3.4.0 - [#3114] - Use {@link #bindValue(Object, Field)} instead - */ - @NotNull - @Deprecated - BindContext bindValues(Object... values) throws DataAccessException; - } diff --git a/jOOQ/src/main/java/org/jooq/Context.java b/jOOQ/src/main/java/org/jooq/Context.java index 93eeb61106..08879319b2 100644 --- a/jOOQ/src/main/java/org/jooq/Context.java +++ b/jOOQ/src/main/java/org/jooq/Context.java @@ -761,44 +761,4 @@ public interface Context> extends Scope { */ @NotNull C castModeIf(CastMode mode, boolean condition); - - /** - * Whether casting must be applied. The result follows this logic: - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
CastModeresult
ALWAYStrue
NEVERfalse
SOMEtrue or false depending on the dialect
DEFAULTnull
- * - * @deprecated - [#3703] - 3.5.0 - Do not use this any longer - */ - @Nullable - @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 - */ - @NotNull - @Deprecated - C castModeSome(SQLDialect... dialects); } diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index c71704fc40..14941a17d9 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -812,13 +812,6 @@ public interface DSLContext extends Scope { @NotNull BindContext bindContext(PreparedStatement stmt); - /** - * @deprecated - [#2662] - 3.2.0 - Do not reuse this method. It will be - * removed with jOOQ 4.0 - */ - @Deprecated - int bind(QueryPart part, PreparedStatement stmt); - // ------------------------------------------------------------------------- // XXX Attachable and Serializable API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/FutureResult.java b/jOOQ/src/main/java/org/jooq/FutureResult.java deleted file mode 100644 index a0e66f150a..0000000000 --- a/jOOQ/src/main/java/org/jooq/FutureResult.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Other licenses: - * ----------------------------------------------------------------------------- - * Commercial licenses for this work are available. These replace the above - * ASL 2.0 and offer limited warranties, support, maintenance, and commercial - * database integrations. - * - * For more information, please visit: http://www.jooq.org/licenses - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - */ -package org.jooq; - -import java.util.concurrent.Future; - -/** - * Fetch results asynchronously. - *

- * This type wraps fetching of records in a {@link java.util.concurrent.Future}, - * such that you can access the actual records at a future instant. This is - * especially useful when - *

    - *
  • You want to load heavy data in the background, for instance when the user - * logs in and accesses a pre-calculated dashboard screen, before they access - * the heavy data.
    • - *
  • You want to parallelise several independent OLAP queries before merging - * all data into a single report
    • - *
  • ...
    • - *
- * - * @deprecated - 3.2.0 - [#2581] - This type will be removed in jOOQ 4.0 - */ -@Deprecated -public interface FutureResult extends Future> { - -} diff --git a/jOOQ/src/main/java/org/jooq/Query.java b/jOOQ/src/main/java/org/jooq/Query.java index c72c7cb966..9ee09c4159 100644 --- a/jOOQ/src/main/java/org/jooq/Query.java +++ b/jOOQ/src/main/java/org/jooq/Query.java @@ -175,26 +175,6 @@ public interface Query extends Statement, Attachable, AutoCloseable { @NotNull String getSQL(); - /** - * Retrieve the SQL code rendered by this Query. - *

- * [#1520] Note that the query actually being executed might not contain any - * bind variables, in case the number of bind variables exceeds your SQL - * dialect's maximum number of supported bind variables. This is not - * reflected by this method, which will only use inline - * argument to decide whether to render bind values. - *

- * See {@link #getSQL()} for more details. - * - * @param inline Whether to inline bind variables. This overrides values in - * {@link Settings#getStatementType()} - * @return The generated SQL - * @deprecated - [#2414] - 3.1.0 - Use {@link #getSQL(ParamType)} instead - */ - @NotNull - @Deprecated - String getSQL(boolean inline); - /** * Retrieve the SQL code rendered by this Query. *

diff --git a/jOOQ/src/main/java/org/jooq/QueryPartInternal.java b/jOOQ/src/main/java/org/jooq/QueryPartInternal.java index 1c77e26a7f..5b771b002a 100644 --- a/jOOQ/src/main/java/org/jooq/QueryPartInternal.java +++ b/jOOQ/src/main/java/org/jooq/QueryPartInternal.java @@ -70,33 +70,6 @@ public interface QueryPartInternal extends QueryPart { @Deprecated void accept(Context ctx); - /** - * Render this {@link QueryPart} to a SQL string contained in - * context.sql(). The context will contain - * additional information about how to render this QueryPart, - * e.g. whether this QueryPart should be rendered as a - * declaration or reference, whether this QueryPart's contained - * bind variables should be inlined or replaced by '?', etc. - * - * @deprecated - 3.4.0 - [#2694] - Use {@link #accept(Context)} instead. - */ - @Deprecated - void toSQL(RenderContext ctx); - - /** - * Bind all parameters of this {@link QueryPart} to a PreparedStatement - *

- * This method is for JOOQ INTERNAL USE only. Do not reference directly - * - * @param ctx The context holding the next bind index and other information - * for variable binding - * @throws DataAccessException If something went wrong while binding a - * variable - * @deprecated - 3.4.0 - [#2694] - Use {@link #accept(Context)} instead. - */ - @Deprecated - void bind(BindContext ctx) throws DataAccessException; - /** * The {@link Clause}s that are represented by this query part. *

diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java index 4879a8d08c..bdc940c693 100644 --- a/jOOQ/src/main/java/org/jooq/Record.java +++ b/jOOQ/src/main/java/org/jooq/Record.java @@ -1438,21 +1438,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ T getValue(Field field) throws IllegalArgumentException; - /** - * Get a value from this record, providing a field. - * - * @param The generic field parameter - * @param field The field - * @param defaultValue The default value instead of null - * @return The value of a field contained in this record, or defaultValue, - * if null - * @throws IllegalArgumentException If the argument field is not contained - * in {@link #fieldsRow()} - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - T getValue(Field field, T defaultValue) throws IllegalArgumentException; - /** * Get a converted value from this Record, providing a field. *

@@ -1463,28 +1448,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ T getValue(Field field, Class type) throws IllegalArgumentException, DataTypeException; - /** - * Get a converted value from this record, providing a field. - *

- * The {@link Converter} that is provided by - * {@link Configuration#converterProvider()} will be used to convert the - * value to U - * - * @param The conversion type parameter - * @param field The field - * @param type The conversion type - * @param defaultValue The default value instead of null - * @return The value of a field contained in this record, or defaultValue, - * if null - * @throws IllegalArgumentException If the argument field is not contained - * in {@link #fieldsRow()} - * @throws DataTypeException wrapping any data type conversion exception - * that might have occurred - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - U getValue(Field field, Class type, U defaultValue) throws IllegalArgumentException, DataTypeException; - /** * Get a converted value from this Record, providing a field. *

@@ -1495,25 +1458,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ U getValue(Field field, Converter converter) throws IllegalArgumentException, DataTypeException; - /** - * Get a converted value from this record, providing a field. - * - * @param The database type parameter - * @param The conversion type parameter - * @param field The field - * @param converter The data type converter - * @param defaultValue The default value instead of null - * @return The value of a field contained in this record, or defaultValue, - * if null - * @throws IllegalArgumentException If the argument field is not contained - * in {@link #fieldsRow()} - * @throws DataTypeException wrapping any data type conversion exception - * that might have occurred - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - U getValue(Field field, Converter converter, U defaultValue) throws IllegalArgumentException, DataTypeException; - /** * Get a value from this Record, providing a field name. *

@@ -1524,20 +1468,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ Object getValue(String fieldName) throws IllegalArgumentException; - /** - * Get a value from this record, providing a field name. - * - * @param fieldName The field's name - * @param defaultValue The default value instead of null - * @return The value of a field's name contained in this record, or - * defaultValue, if null - * @throws IllegalArgumentException If the argument fieldName is not - * contained in the record - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - Object getValue(String fieldName, Object defaultValue) throws IllegalArgumentException; - /** * Get a converted value from this Record, providing a field name. *

@@ -1548,28 +1478,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ T getValue(String fieldName, Class type) throws IllegalArgumentException, DataTypeException; - /** - * Get a converted value from this record, providing a field name. - *

- * The {@link Converter} that is provided by - * {@link Configuration#converterProvider()} will be used to convert the - * value to U - * - * @param The conversion type parameter - * @param fieldName The field's name - * @param type The conversion type - * @param defaultValue The default value instead of null - * @return The value of a field's name contained in this record, or - * defaultValue, if null - * @throws IllegalArgumentException If the argument fieldName is not - * contained in the record - * @throws DataTypeException wrapping any data type conversion exception - * that might have occurred - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - U getValue(String fieldName, Class type, U defaultValue) throws IllegalArgumentException, DataTypeException; - /** * Get a converted value from this Record, providing a field name. *

@@ -1580,24 +1488,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ U getValue(String fieldName, Converter converter) throws IllegalArgumentException, DataTypeException; - /** - * Get a converted value from this record, providing a field name. - * - * @param The conversion type parameter - * @param fieldName The field's name - * @param converter The data type converter - * @param defaultValue The default value instead of null - * @return The value of a field's name contained in this record, or - * defaultValue, if null - * @throws IllegalArgumentException If the argument fieldName is not - * contained in the record - * @throws DataTypeException wrapping any data type conversion exception - * that might have occurred - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - U getValue(String fieldName, Converter converter, U defaultValue) throws IllegalArgumentException, DataTypeException; - /** * Get a value from this Record, providing a field name. *

@@ -1639,20 +1529,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ Object getValue(int index) throws IllegalArgumentException; - /** - * Get a value from this record, providing a field index. - * - * @param index The 0-based field index in this record. - * @param defaultValue The default value instead of null - * @return The value of a field's index contained in this record, or - * defaultValue, if null - * @throws IllegalArgumentException If the argument index is not contained - * in the record - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - Object getValue(int index, Object defaultValue) throws IllegalArgumentException; - /** * Get a converted value from this record, providing a field index. *

@@ -1664,28 +1540,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ T getValue(int index, Class type) throws IllegalArgumentException, DataTypeException; - /** - * Get a converted value from this record, providing a field index. - *

- * The {@link Converter} that is provided by - * {@link Configuration#converterProvider()} will be used to convert the - * value to U - * - * @param The conversion type parameter - * @param index The 0-based field index in this record. - * @param type The conversion type - * @param defaultValue The default value instead of null - * @return The value of a field's index contained in this record, or - * defaultValue, if null - * @throws IllegalArgumentException If the argument index is not contained - * in the record - * @throws DataTypeException wrapping data type conversion exception that - * might have occurred - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - U getValue(int index, Class type, U defaultValue) throws IllegalArgumentException, DataTypeException; - /** * Get a converted value from this record, providing a field index. *

@@ -1697,24 +1551,6 @@ public interface Record extends Fields, Attachable, Comparable, Formatta */ U getValue(int index, Converter converter) throws IllegalArgumentException, DataTypeException; - /** - * Get a converted value from this record, providing a field index. - * - * @param The conversion type parameter - * @param index The 0-based field index in this record. - * @param converter The data type converter - * @param defaultValue The default value instead of null - * @return The value of a field's index contained in this record, or - * defaultValue, if null - * @throws IllegalArgumentException If the argument index is not contained - * in the record - * @throws DataTypeException wrapping data type conversion exception that - * might have occurred - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - U getValue(int index, Converter converter, U defaultValue) throws IllegalArgumentException, DataTypeException; - /** * Set a value into this record. *

diff --git a/jOOQ/src/main/java/org/jooq/RenderContext.java b/jOOQ/src/main/java/org/jooq/RenderContext.java index e06e5a6613..567378a615 100644 --- a/jOOQ/src/main/java/org/jooq/RenderContext.java +++ b/jOOQ/src/main/java/org/jooq/RenderContext.java @@ -37,10 +37,6 @@ */ package org.jooq; -import org.jooq.conf.ParamType; - -import org.jetbrains.annotations.NotNull; - /** * The render context is used for rendering {@link QueryPart}'s to SQL. *

@@ -52,58 +48,6 @@ import org.jetbrains.annotations.NotNull; */ public interface RenderContext extends Context { - /** - * Recurse rendering. - * - * @deprecated - 3.2.0 - [#2666] - Use {@link #visit(QueryPart)} instead - */ - @NotNull - @Deprecated - RenderContext sql(QueryPart part); - - /** - * Whether bind variables should be inlined, rather than rendered as - * '?'. - * - * @deprecated - 3.1.0 - [#2414] - This method should no longer be used. Use - * {@link #paramType()} instead. - */ - @Deprecated - boolean inline(); - - /** - * Set the new context value for {@link #inline()}. - * - * @deprecated - 3.1.0 - [#2414] - This method should no longer be used. Use - * {@link #paramType(ParamType)} instead. - */ - @NotNull - @Deprecated - RenderContext inline(boolean inline); - - /** - * Whether bind variables should be rendered as named parameters:
- *   :1, :2, :custom_name - *

- * or as JDBC bind variables
- *   ? - * - * @deprecated - 3.1.0 - [#2414] - This method should no longer be used. Use - * {@link #paramType()} instead. - */ - @Deprecated - boolean namedParams(); - - /** - * Set the new context value for {@link #namedParams()}. - * - * @deprecated - 3.1.0 - [#2414] - This method should no longer be used. Use - * {@link #paramType(ParamType)} instead. - */ - @NotNull - @Deprecated - RenderContext namedParams(boolean renderNamedParams); - /** * The cast mode for bind values. * @@ -121,16 +65,6 @@ public interface RenderContext extends Context { */ NEVER, - /** - * 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, - /** * Cast when needed. This is the default mode if not specified * otherwise. diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java index 525f03f19c..96a43b54a0 100644 --- a/jOOQ/src/main/java/org/jooq/Result.java +++ b/jOOQ/src/main/java/org/jooq/Result.java @@ -82,23 +82,6 @@ public interface Result extends Fields, List, Attachable, F */ T getValue(int index, Field field) throws IndexOutOfBoundsException, IllegalArgumentException; - /** - * Convenience method to fetch a value at a given position in the result. - * - * @param The value's field's generic type parameter - * @param index The record's 0-based index in the record list - * @param field The value's field - * @param defaultValue The default value if the value was null - * @return The value - * @throws IndexOutOfBoundsException if the index is out of range ( - * index < 0 || index >= size()) - * @throws IllegalArgumentException If the argument field is not contained - * in {@link #fieldsRow()} - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Deprecated - T getValue(int index, Field field, T defaultValue) throws IndexOutOfBoundsException, IllegalArgumentException; - /** * Convenience method to fetch a value at a given position in the result. * @@ -113,23 +96,6 @@ public interface Result extends Fields, List, Attachable, F @Nullable Object getValue(int index, int fieldIndex) throws IndexOutOfBoundsException, IllegalArgumentException; - /** - * Convenience method to fetch a value at a given position in the result. - * - * @param index The record's 0-based index in the record list - * @param fieldIndex The value's field index - * @param defaultValue The default value if the value was null - * @return The value - * @throws IndexOutOfBoundsException if the index is out of range ( - * index < 0 || index >= size()) - * @throws IllegalArgumentException If the argument fieldIndex is not - * contained in {@link #fieldsRow()} - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Nullable - @Deprecated - Object getValue(int index, int fieldIndex, Object defaultValue) throws IndexOutOfBoundsException, IllegalArgumentException; - /** * Convenience method to fetch a value at a given position in the result. * @@ -144,23 +110,6 @@ public interface Result extends Fields, List, Attachable, F @Nullable Object getValue(int index, String fieldName) throws IndexOutOfBoundsException, IllegalArgumentException; - /** - * Convenience method to fetch a value at a given position in the result. - * - * @param index The record's 0-based index in the record list - * @param fieldName The value's field name - * @param defaultValue The default value if the value was null - * @return The value - * @throws IndexOutOfBoundsException if the index is out of range ( - * index < 0 || index >= size()) - * @throws IllegalArgumentException If the argument fieldName is not - * contained in {@link #fieldsRow()} - * @deprecated - 3.3.0 - [#2878] - This method will be removed in jOOQ 4.0 - */ - @Nullable - @Deprecated - Object getValue(int index, String fieldName, Object defaultValue) throws IndexOutOfBoundsException, IllegalArgumentException; - /** * Convenience method to fetch all values for a given field. This is * especially useful, when selecting only a single field. diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java index 08ca5f0a67..7405f3a317 100644 --- a/jOOQ/src/main/java/org/jooq/Select.java +++ b/jOOQ/src/main/java/org/jooq/Select.java @@ -174,36 +174,4 @@ public interface Select extends ResultQuery, TableLike, */ @NotNull List> getSelect(); - - /** - * Execute this query in the context of its attached executor and return a - * COUNT(*) value. - *

- * This wraps a pre-existing SELECT query in another one to - * calculate the COUNT(*) value, without modifying the original - * SELECT. An example: 

-     * -- Original query:
-     * SELECT id, title FROM book WHERE title LIKE '%a%'
-     *
-     * -- Wrapped query:
-     * SELECT count(*) FROM (
-     *   SELECT id, title FROM book WHERE title LIKE '%a%'
-     * )
-     *
This is particularly useful for those databases that do not - * support the COUNT(*) OVER() window function to calculate - * total results in paged queries. - * - * @return The COUNT(*) result - * @throws DataAccessException if something went wrong executing the query - * @deprecated - 3.5.0 - [#3356] - This method is being removed as it is - * confusingly different from all the other types of - * {@link #fetch()} methods, in that it modifies the original - * {@link Select} statement by wrapping it. In particular, this - * method can be easily confused with {@link #fetch(Field)}, or - * more concretely fetch(count()), which has an - * entirely different semantics. Use - * {@link DSLContext#fetchCount(Select)} instead. - */ - @Deprecated - int fetchCount() throws DataAccessException; } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java index bd6e38d727..d1d8e90a24 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java @@ -67,59 +67,11 @@ abstract class AbstractBindContext extends AbstractContext implemen // BindContext API // ------------------------------------------------------------------------ - @Override - @Deprecated - public final BindContext bind(Collection parts) { - return visitAll(this, parts); - } - - @Override - @Deprecated - public final BindContext bind(QueryPart[] parts) { - return visitAll(this, parts); - } - - @Override - @Deprecated - public final BindContext bind(QueryPart part) { - return visit(part); - } - @Override protected void visit0(QueryPartInternal internal) { bindInternal(internal); } - @Override - @Deprecated - public final BindContext bindValues(Object... values) { - - // [#724] When values is null, this is probably due to API-misuse - // The user probably meant new Object[] { null } - if (values == null) { - bindValues(new Object[] { null }); - } - else { - for (Object value : values) { - Class type = (value == null) ? Object.class : value.getClass(); - bindValue(value, DSL.val(value, type)); - } - } - - return this; - } - - @Override - @Deprecated - public final BindContext bindValue(Object value, Class type) { - try { - return bindValue0(value, DSL.val(value, type)); - } - catch (SQLException e) { - throw Tools.translate(null, e); - } - } - @Override public final BindContext bindValue(Object value, Field field) throws DataAccessException { try { diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java index 10df3a7fb5..b9497c5ff9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java @@ -903,25 +903,6 @@ abstract class AbstractContext> extends AbstractScope imple return (C) this; } - @Override - @Deprecated - public final Boolean cast() { - switch (castMode) { - case ALWAYS: - return true; - case NEVER: - return false; - } - - return null; - } - - @Override - @Deprecated - public final C castModeSome(SQLDialect... dialects) { - return (C) this; - } - // ------------------------------------------------------------------------ // XXX BindContext API // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java index b7f669d93c..f865f47016 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java @@ -96,12 +96,6 @@ abstract class AbstractDelegatingQuery return delegate.getSQL(); } - @Override - @Deprecated - public final String getSQL(boolean inline) { - return delegate.getSQL(inline); - } - @Override public final String getSQL(ParamType paramType) { return delegate.getSQL(paramType); diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java index 18d951bce2..68b6e7363d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java @@ -613,10 +613,4 @@ abstract class AbstractQuery extends AbstractFetchable impl throw new IllegalArgumentException("ParamType not supported: " + paramType); } - - @Override - @Deprecated - public final String getSQL(boolean inline) { - return getSQL(inline ? INLINED : INDEXED); - } } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java index 97b9393e67..a965a2d1e9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java @@ -75,22 +75,6 @@ abstract class AbstractQueryPart implements QueryPartInternal { // Deprecated API // ------------------------------------------------------------------------- - /** - * @deprecated - 3.4.0 - [#2694] - Use - * {@link QueryPartInternal#accept(Context)} instead. - */ - @Override - @Deprecated - public final void toSQL(RenderContext context) {} - - /** - * @deprecated - 3.4.0 - [#2694] - Use - * {@link QueryPartInternal#accept(Context)} instead. - */ - @Override - @Deprecated - public final void bind(BindContext context) throws DataAccessException {} - /** * @deprecated - 3.11.0 - [#8179] - This functionality will be removed in * the future. diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java index c5a5fe2a39..6472f7234d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java @@ -1257,108 +1257,46 @@ abstract class AbstractRecord extends AbstractStore implements Record { return get(field); } - @Override - @Deprecated - public final T getValue(Field field, T defaultValue) { - T result = getValue(field); - return result != null ? result : defaultValue; - } - @Override public final T getValue(Field field, Class type) { return get(field, type); } - @Override - @Deprecated - public final T getValue(Field field, Class type, T defaultValue) { - final T result = get(field, type); - return result == null ? defaultValue : result; - } - @Override public final U getValue(Field field, Converter converter) { return get(field, converter); } - @Override - @Deprecated - public final U getValue(Field field, Converter converter, U defaultValue) { - final U result = get(field, converter); - return result == null ? defaultValue : result; - } - @Override public final Object getValue(int index) { return get(index); } - @Override - @Deprecated - public final Object getValue(int index, Object defaultValue) { - final Object result = get(index); - return result == null ? defaultValue : result; - } - @Override public final T getValue(int index, Class type) { return get(index, type); } - @Override - @Deprecated - public final T getValue(int index, Class type, T defaultValue) { - final T result = get(index, type); - return result == null ? defaultValue : result; - } - @Override public final U getValue(int index, Converter converter) { return get(index, converter); } - @Override - @Deprecated - public final U getValue(int index, Converter converter, U defaultValue) { - final U result = get(index, converter); - return result == null ? defaultValue : result; - } - @Override public final Object getValue(String fieldName) { return get(fieldName); } - @Override - @Deprecated - public final Object getValue(String fieldName, Object defaultValue) { - return getValue(indexOrFail(fields, fieldName), defaultValue); - } - @Override public final T getValue(String fieldName, Class type) { return get(fieldName, type); } - @Override - @Deprecated - public final T getValue(String fieldName, Class type, T defaultValue) { - final T result = get(fieldName, type); - return result == null ? defaultValue : result; - } - @Override public final U getValue(String fieldName, Converter converter) { return get(fieldName, converter); } - @Override - @Deprecated - public final U getValue(String fieldName, Converter converter, U defaultValue) { - final U result = get(fieldName, converter); - return result == null ? defaultValue : result; - } - @Override public final Object getValue(Name fieldName) { return get(fieldName); diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java index f518d23a1b..46b41f0b71 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java @@ -402,73 +402,6 @@ package org.jooq.impl; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 9fefcf4a06..1f8671bda7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -540,12 +540,6 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new DefaultBindContext(configuration(), stmt); } - @Override - @Deprecated - public int bind(QueryPart part, PreparedStatement stmt) { - return bindContext(stmt).visit(part).peekIndex(); - } - // ------------------------------------------------------------------------- // XXX Attachable and Serializable API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java index 6219b92a8c..bfc8d781db 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java @@ -618,12 +618,6 @@ class DefaultRenderContext extends AbstractContext implements Ren return this; } - @Override - @Deprecated - public final RenderContext sql(QueryPart part) { - return visit(part); - } - @Override protected final void visit0(QueryPartInternal internal) { int before = bindValues.size(); @@ -695,32 +689,6 @@ class DefaultRenderContext extends AbstractContext implements Ren throw new ForceInlineSignal(); } - @Override - @Deprecated - public final boolean inline() { - return paramType == INLINED; - } - - @Override - @Deprecated - public final boolean namedParams() { - return paramType == NAMED; - } - - @Override - @Deprecated - public final RenderContext inline(boolean i) { - this.paramType = i ? INLINED : INDEXED; - return this; - } - - @Override - @Deprecated - public final RenderContext namedParams(boolean r) { - this.paramType = r ? NAMED : INDEXED; - return this; - } - // ------------------------------------------------------------------------ // Object API // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index cbcbdb0934..53d19cd60d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -7537,7 +7537,7 @@ final class ParserContext { || parseFunctionNameIf("DEGREE") || parseFunctionNameIf("DEG")) return deg((Field) parseFieldNumericOpParenthesised()); - else if (parseFunctionNameIf("DATA_LENGTH")) + else if (parseFunctionNameIf("DATALENGTH")) return octetLength((Field) parseFieldParenthesised(S)); if ((field = parseFieldDecodeIf()) != null) diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java index 28e1be0967..da793de8c1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java @@ -166,34 +166,16 @@ final class ResultImpl extends AbstractResult implements Re return get(index).get(field); } - @Override - @Deprecated - public final T getValue(int index, Field field, T defaultValue) { - return get(index).getValue(field, defaultValue); - } - @Override public final Object getValue(int index, int fieldIndex) { return get(index).get(fieldIndex); } - @Override - @Deprecated - public final Object getValue(int index, int fieldIndex, Object defaultValue) { - return get(index).getValue(fieldIndex, defaultValue); - } - @Override public final Object getValue(int index, String fieldName) { return get(index).get(fieldName); } - @Override - @Deprecated - public final Object getValue(int index, String fieldName, Object defaultValue) { - return get(index).getValue(fieldName, defaultValue); - } - @Override public final List getValues(Field field) { return (List) getValues(indexOrFail(fieldsRow(), field)); diff --git a/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java b/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java index b9fd913325..2a82087f8e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java +++ b/jOOQ/src/main/java/org/jooq/impl/ScopeMarker.java @@ -44,12 +44,10 @@ import static org.jooq.impl.Keywords.K_WITH; import static org.jooq.impl.Tools.increment; import static org.jooq.impl.Tools.DataKey.DATA_TOP_LEVEL_CTE; -import org.jooq.BindContext; import org.jooq.Clause; import org.jooq.Context; // ... import org.jooq.QueryPartInternal; -import org.jooq.RenderContext; import org.jooq.Statement; import org.jooq.impl.AbstractContext.ScopeStackElement; import org.jooq.impl.Tools.DataExtendedKey; @@ -192,12 +190,6 @@ enum ScopeMarker { @Override public final void accept(Context ctx) {} - @Override - public final void toSQL(RenderContext ctx) {} - - @Override - public final void bind(BindContext ctx) {} - @Override public final Clause[] clauses(Context ctx) { return null; diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java index 80a8ce3845..8a709c6665 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java @@ -279,12 +279,6 @@ final class SelectImpl) getDelegate(); } - @Override - @Deprecated - public final int fetchCount() { - return getDelegate().fetchCount(); - } - /** * This method must be able to return both incompatible types * SelectSelectStep<Record> and SelectSelectStep<R> diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 3240caf11c..edaade305f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -257,8 +257,6 @@ import org.jooq.tools.Convert; import org.jooq.tools.JooqLogger; import org.jooq.tools.StringUtils; -import org.jetbrains.annotations.NotNull; - /** * A sub-select is a SELECT statement that can be combined with * other SELECT statement in UNIONs and similar @@ -469,11 +467,6 @@ final class SelectQueryImpl extends AbstractResultQuery imp return result; } - @Override - public final int fetchCount() throws DataAccessException { - return DSL.using(configuration()).fetchCount(this); - } - @SuppressWarnings("unchecked") @Override public final Field asField() {