From 462dabafcf902f460b092550504fe0de5f62f255 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 7 May 2020 17:10:31 +0200 Subject: [PATCH] Remove SuppressWarnings(deprecation) from internal code --- .../java/org/jooq/meta/AbstractTypedElementDefinition.java | 2 -- jOOQ-meta/src/main/java/org/jooq/meta/Databases.java | 1 - jOOQ/src/main/java/org/jooq/Allow.java | 1 - jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java | 1 - jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java | 2 -- jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java | 1 - jOOQ/src/main/java/org/jooq/impl/DSL.java | 5 ----- jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java | 1 - jOOQ/src/main/java/org/jooq/impl/DiagnosticsConnection.java | 1 - jOOQ/src/main/java/org/jooq/impl/DivideBy.java | 1 - jOOQ/src/main/java/org/jooq/impl/Tools.java | 3 --- jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java | 3 --- 12 files changed, 22 deletions(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java index 5aa465a583..7d39a2026f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java @@ -172,7 +172,6 @@ public abstract class AbstractTypedElementDefinition return result; } - @SuppressWarnings("deprecation") public static final DataTypeDefinition mapDefinedType(Definition container, Definition child, DataTypeDefinition definedType, JavaTypeResolver resolver) { DataTypeDefinition result = definedType; Database db = container.getDatabase(); @@ -311,7 +310,6 @@ public abstract class AbstractTypedElementDefinition return result; } - @SuppressWarnings("deprecation") public static final CustomType customType(Database db, ForcedType forcedType) { String name = forcedType.getName(); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java index 3c63ca2b34..a417968443 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java @@ -75,7 +75,6 @@ public class Databases { /** * Get a reference to a {@link Database} class for a given {@link SQLDialect}. */ - @SuppressWarnings("deprecation") public static final Class databaseClass(SQLDialect dialect) { Class result = JDBCDatabase.class; diff --git a/jOOQ/src/main/java/org/jooq/Allow.java b/jOOQ/src/main/java/org/jooq/Allow.java index 83251ebee2..fa8b84c8c0 100644 --- a/jOOQ/src/main/java/org/jooq/Allow.java +++ b/jOOQ/src/main/java/org/jooq/Allow.java @@ -150,7 +150,6 @@ public @interface Allow { * A list of jOOQ {@link SQLDialect} which are required on any jOOQ API * method that is annotated with {@link Support}. */ - @SuppressWarnings("deprecation") SQLDialect[] value() default { diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java index 1d3f57a90a..d48cf81778 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractBindContext.java @@ -274,7 +274,6 @@ abstract class AbstractBindContext extends AbstractContext implemen /** * Subclasses may override this method to achieve different behaviour */ - @SuppressWarnings("deprecation") protected void bindInternal(QueryPartInternal internal) { internal.accept(this); } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java index 79800ba5c9..9ab8f20535 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java @@ -157,7 +157,6 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query { *

* {@inheritDoc} */ - @SuppressWarnings("deprecation") @Override public Query bind(String param, Object value) { Integer index = Ints.tryParse(param); @@ -184,7 +183,6 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query { *

* {@inheritDoc} */ - @SuppressWarnings("deprecation") @Override public Query bind(int index, Object value) { Param[] params = getParams().values().toArray(EMPTY_PARAM); diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java index 7e9244bbb5..206960d198 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java @@ -483,6 +483,5 @@ package org.jooq.impl; - diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 1ad4fd520d..4945767bec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -20860,7 +20860,6 @@ public class DSL { * * @see #val(Object) */ - @SuppressWarnings("deprecation") @Support public static Param inline(T value) { Param val = val(value); @@ -21664,7 +21663,6 @@ public class DSL { * * @see #val(Object, Class) */ - @SuppressWarnings("deprecation") @Support public static Param inline(Object value, Class type) { Param val = val(value, type); @@ -21687,7 +21685,6 @@ public class DSL { * * @see #val(Object, Field) */ - @SuppressWarnings("deprecation") @Support public static Param inline(Object value, Field field) { Param val = val(value, field); @@ -21710,7 +21707,6 @@ public class DSL { * * @see #val(Object, DataType) */ - @SuppressWarnings("deprecation") @Support public static Param inline(Object value, DataType type) { Param val = val(value, type); @@ -22175,7 +22171,6 @@ public class DSL { * @param dataType The coercion data type * @return The most specific data type */ - @SuppressWarnings("deprecation") private static DataType mostSpecific(T value, DataType dataType) { // [#3888] With custom data type conversion, users may wish to diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index fdf045f84a..a42399f97a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -838,7 +838,6 @@ public class DefaultDataType implements DataType { return asConvertedDataType(DefaultBinding.newBinding(converter, this, null)); } - @SuppressWarnings("deprecation") @Override public /* non-final */ DataType asConvertedDataType(Binding newBinding) { if (binding == newBinding) diff --git a/jOOQ/src/main/java/org/jooq/impl/DiagnosticsConnection.java b/jOOQ/src/main/java/org/jooq/impl/DiagnosticsConnection.java index 2d29034621..ec8741b375 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DiagnosticsConnection.java +++ b/jOOQ/src/main/java/org/jooq/impl/DiagnosticsConnection.java @@ -76,7 +76,6 @@ final class DiagnosticsConnection extends DefaultConnection { final Parser parser; final DiagnosticsListeners listeners; - @SuppressWarnings("deprecation") DiagnosticsConnection(Configuration configuration) { super(configuration.connectionProvider().acquire()); diff --git a/jOOQ/src/main/java/org/jooq/impl/DivideBy.java b/jOOQ/src/main/java/org/jooq/impl/DivideBy.java index c3c0c0a01d..d11f9e3a05 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DivideBy.java +++ b/jOOQ/src/main/java/org/jooq/impl/DivideBy.java @@ -134,7 +134,6 @@ implements /** * Extracted method for type-safety */ - @SuppressWarnings("deprecation") private final void selfJoin(org.jooq.ConditionProvider selfJoin, Table outer, Table inner, Field field) { Field outerField = outer.field(field); Field innerField = inner.field(field); diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 531842d347..91ce3274eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -2818,7 +2818,6 @@ final class Tools { /** * Map a {@link Catalog} according to the configured {@link org.jooq.SchemaMapping} */ - @SuppressWarnings("deprecation") static final Catalog getMappedCatalog(Configuration configuration, Catalog catalog) { if (configuration != null) { org.jooq.SchemaMapping mapping = configuration.schemaMapping(); @@ -2833,7 +2832,6 @@ final class Tools { /** * Map a {@link Schema} according to the configured {@link org.jooq.SchemaMapping} */ - @SuppressWarnings("deprecation") static final Schema getMappedSchema(Configuration configuration, Schema schema) { if (configuration != null) { org.jooq.SchemaMapping mapping = configuration.schemaMapping(); @@ -2848,7 +2846,6 @@ final class Tools { /** * Map a {@link Table} according to the configured {@link org.jooq.SchemaMapping} */ - @SuppressWarnings("deprecation") static final Table getMappedTable(Configuration configuration, Table table) { if (configuration != null) { org.jooq.SchemaMapping mapping = configuration.schemaMapping(); diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java index 760c573992..93ec0b8205 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSet.java @@ -181,7 +181,6 @@ public class MockResultSet extends JDBC41ResultSet implements ResultSet, Seriali return cal.getTimeInMillis(); } - @SuppressWarnings("deprecation") private Timestamp withTZ(Timestamp timestamp, Calendar cal) { if (timestamp == null) return null; @@ -201,7 +200,6 @@ public class MockResultSet extends JDBC41ResultSet implements ResultSet, Seriali return r; } - @SuppressWarnings("deprecation") private Time withTZ(Time time, Calendar cal) { if (time == null) return null; @@ -214,7 +212,6 @@ public class MockResultSet extends JDBC41ResultSet implements ResultSet, Seriali return new Time(getMillis(cal, 1970, 0, 1, hour, minute, second, millis)); } - @SuppressWarnings("deprecation") private Date withTZ(Date date, Calendar cal) { if (date == null) return null;