From eb4702ea6cb81b85e1f7d8ea72043e47e7c9e405 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 17 Dec 2015 15:05:01 +0100 Subject: [PATCH] Remove confusing [java-8] tags in OSS edition --- .../java/org/jooq/util/JavaGenerator.java | 4 +- .../java/org/jooq/ConnectionCallable.java | 4 +- .../java/org/jooq/ConnectionRunnable.java | 4 +- .../main/java/org/jooq/ConverterProvider.java | 4 +- jOOQ/src/main/java/org/jooq/Cursor.java | 10 ++-- jOOQ/src/main/java/org/jooq/DAO.java | 4 +- jOOQ/src/main/java/org/jooq/DSLContext.java | 50 +++++++++---------- .../main/java/org/jooq/DeleteResultStep.java | 4 +- .../org/jooq/ExecuteListenerProvider.java | 4 +- .../main/java/org/jooq/InsertResultStep.java | 4 +- jOOQ/src/main/java/org/jooq/Query.java | 6 +-- .../src/main/java/org/jooq/RecordHandler.java | 4 +- .../java/org/jooq/RecordListenerProvider.java | 4 +- jOOQ/src/main/java/org/jooq/RecordMapper.java | 4 +- .../java/org/jooq/RecordMapperProvider.java | 4 +- jOOQ/src/main/java/org/jooq/ResultQuery.java | 8 +-- .../java/org/jooq/TransactionalCallable.java | 4 +- .../java/org/jooq/TransactionalRunnable.java | 4 +- .../main/java/org/jooq/UpdateResultStep.java | 4 +- .../java/org/jooq/VisitListenerProvider.java | 4 +- .../java/org/jooq/impl/AbstractField.java | 20 ++++---- .../main/java/org/jooq/impl/AbstractKey.java | 4 +- .../main/java/org/jooq/impl/AbstractKeys.java | 8 +-- .../org/jooq/impl/AbstractResultQuery.java | 8 +-- .../main/java/org/jooq/impl/BatchSingle.java | 4 +- .../main/java/org/jooq/impl/CursorImpl.java | 8 +-- jOOQ/src/main/java/org/jooq/impl/DAOImpl.java | 20 ++++---- jOOQ/src/main/java/org/jooq/impl/DSL.java | 16 +++--- .../java/org/jooq/impl/DefaultBinding.java | 20 ++++---- .../java/org/jooq/impl/DefaultDSLContext.java | 48 +++++++++--------- .../java/org/jooq/impl/DefaultDataType.java | 4 +- .../main/java/org/jooq/impl/DeleteImpl.java | 4 +- .../main/java/org/jooq/impl/InsertImpl.java | 4 +- .../java/org/jooq/impl/RecordFactory.java | 4 +- .../java/org/jooq/impl/ReferenceImpl.java | 12 ++--- .../main/java/org/jooq/impl/SQLDataType.java | 4 +- .../main/java/org/jooq/impl/SelectImpl.java | 8 +-- .../java/org/jooq/impl/UniqueKeyImpl.java | 4 +- .../main/java/org/jooq/impl/UpdateImpl.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Utils.java | 8 +-- .../src/main/java/org/jooq/tools/Convert.java | 36 ++++++------- .../main/java/org/jooq/tools/StringUtils.java | 4 +- .../org/jooq/tools/jdbc/MockCallable.java | 4 +- .../org/jooq/tools/jdbc/MockDataProvider.java | 4 +- .../org/jooq/tools/jdbc/MockRunnable.java | 4 +- 45 files changed, 201 insertions(+), 201 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java index ce15e10309..cfbf1bb31b 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java @@ -4830,9 +4830,9 @@ public class JavaGenerator extends AbstractGenerator { return getJavaType(type1).equals(getJavaType(type2)); } - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + private static final List list(T... objects) { List result = new ArrayList(); diff --git a/jOOQ/src/main/java/org/jooq/ConnectionCallable.java b/jOOQ/src/main/java/org/jooq/ConnectionCallable.java index 116d25e0cf..6fe7db19c6 100644 --- a/jOOQ/src/main/java/org/jooq/ConnectionCallable.java +++ b/jOOQ/src/main/java/org/jooq/ConnectionCallable.java @@ -53,9 +53,9 @@ import org.jooq.exception.DataAccessException; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface ConnectionCallable { /** diff --git a/jOOQ/src/main/java/org/jooq/ConnectionRunnable.java b/jOOQ/src/main/java/org/jooq/ConnectionRunnable.java index 7a73f694f1..5414ffc147 100644 --- a/jOOQ/src/main/java/org/jooq/ConnectionRunnable.java +++ b/jOOQ/src/main/java/org/jooq/ConnectionRunnable.java @@ -53,9 +53,9 @@ import org.jooq.exception.DataAccessException; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface ConnectionRunnable { /** diff --git a/jOOQ/src/main/java/org/jooq/ConverterProvider.java b/jOOQ/src/main/java/org/jooq/ConverterProvider.java index f91235eadb..1365490aa4 100644 --- a/jOOQ/src/main/java/org/jooq/ConverterProvider.java +++ b/jOOQ/src/main/java/org/jooq/ConverterProvider.java @@ -48,9 +48,9 @@ package org.jooq; * @deprecated - This API is still EXPERIMENTAL. Do not use yet */ @Deprecated -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface ConverterProvider { /** diff --git a/jOOQ/src/main/java/org/jooq/Cursor.java b/jOOQ/src/main/java/org/jooq/Cursor.java index 167176a9ce..e8fc07f5d6 100644 --- a/jOOQ/src/main/java/org/jooq/Cursor.java +++ b/jOOQ/src/main/java/org/jooq/Cursor.java @@ -68,7 +68,7 @@ import org.jooq.impl.DefaultRecordMapper; * @param The cursor's record type * @author Lukas Eder */ -public interface Cursor extends Iterable /* [java-8] */, AutoCloseable /* [/java-8] */ { +public interface Cursor extends Iterable , AutoCloseable { /** * Get this cursor's row type. @@ -332,7 +332,7 @@ public interface Cursor extends Iterable /* [java-8] */, Au */ Z fetchOneInto(Table table) throws DataAccessException, MappingException; - /* [java-8] */ + /** * Fetch the next record from the cursor. *

@@ -403,7 +403,7 @@ public interface Cursor extends Iterable /* [java-8] */, Au * @throws DataAccessException if something went wrong executing the query */ Stream stream() throws DataAccessException; - /* [/java-8] */ + /** * Explicitly close the underlying {@link PreparedStatement} and @@ -415,9 +415,9 @@ public interface Cursor extends Iterable /* [java-8] */, Au * * @throws DataAccessException if something went wrong executing the query */ - /* [java-8] */ + @Override - /* [/java-8] */ + void close() throws DataAccessException; /** diff --git a/jOOQ/src/main/java/org/jooq/DAO.java b/jOOQ/src/main/java/org/jooq/DAO.java index 889ae9708f..8a6543facb 100644 --- a/jOOQ/src/main/java/org/jooq/DAO.java +++ b/jOOQ/src/main/java/org/jooq/DAO.java @@ -260,7 +260,7 @@ public interface DAO, P, T> { */ P fetchOne(Field field, Z value) throws DataAccessException; - /* [java-8] */ + /** * Find a unique record by a given field and a value. * @@ -274,7 +274,7 @@ public interface DAO, P, T> { * */ Optional

fetchOptional(Field field, Z value) throws DataAccessException; - /* [/java-8] */ + /** * Get the underlying table diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 87fc767d4f..0b22b6c584 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -123,7 +123,7 @@ import org.jooq.tools.jdbc.MockRunnable; * @see Configuration * @author Lukas Eder */ -public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/java-8] */ { +public interface DSLContext extends Scope , AutoCloseable { // ------------------------------------------------------------------------- // XXX AutoCloseable API @@ -143,9 +143,9 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * @throws DataAccessException When something went wrong closing the * underlying resources. */ - /* [java-8] */ + @Override - /* [/java-8] */ + void close() throws DataAccessException; // ------------------------------------------------------------------------- @@ -769,7 +769,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @PlainSQL Cursor fetchLazy(String sql, QueryPart... parts) throws DataAccessException; - /* [java-8] */ + /** * Execute a new query holding plain SQL and "lazily" return the generated * result. @@ -915,7 +915,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support @PlainSQL Stream fetchStream(String sql, QueryPart... parts) throws DataAccessException; - /* [/java-8] */ + /** * Execute a new query holding plain SQL, possibly returning several result @@ -1149,7 +1149,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @PlainSQL Record fetchOne(String sql, QueryPart... parts) throws DataAccessException, TooManyRowsException; - /* [java-8] */ + /** * Execute a new query holding plain SQL. *

@@ -1267,7 +1267,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support @PlainSQL Optional fetchOptional(String sql, QueryPart... parts) throws DataAccessException, TooManyRowsException; - /* [/java-8] */ + /** * Execute a new query holding plain SQL. @@ -1399,7 +1399,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @PlainSQL Object fetchValue(String sql, QueryPart... parts) throws DataAccessException, TooManyRowsException, InvalidResultException; - /* [java-8] */ + /** * Execute a new query holding plain SQL. *

@@ -1525,7 +1525,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support @PlainSQL Optional fetchOptionalValue(String sql, QueryPart... parts) throws DataAccessException, TooManyRowsException, InvalidResultException; - /* [/java-8] */ + /** * Execute a new query holding plain SQL. @@ -2059,7 +2059,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support Record fetchOne(ResultSet rs, Class... types) throws DataAccessException, TooManyRowsException; - /* [java-8] */ + /** * Fetch a record from a JDBC {@link ResultSet} and transform it to a jOOQ * {@link Record}. @@ -2131,7 +2131,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ @Support Optional fetchOptional(ResultSet rs, Class... types) throws DataAccessException, TooManyRowsException; - /* [/java-8] */ + /** * Fetch a record from a JDBC {@link ResultSet} and return the only @@ -2213,7 +2213,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support T fetchValue(ResultSet rs, Class type) throws DataAccessException, TooManyRowsException, InvalidResultException; - /* [java-8] */ + /** * Fetch a record from a JDBC {@link ResultSet} and return the only * contained value. @@ -2293,7 +2293,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ @Support Optional fetchOptionalValue(ResultSet rs, Class type) throws DataAccessException, TooManyRowsException, InvalidResultException; - /* [/java-8] */ + /** * Fetch a result from a JDBC {@link ResultSet} and return the only @@ -2415,7 +2415,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support Cursor fetchLazy(ResultSet rs, Class... types) throws DataAccessException; - /* [java-8] */ + /** * Wrap a JDBC {@link ResultSet} into a jOOQ {@link Stream}. *

@@ -2479,7 +2479,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ @Support Stream fetchStream(ResultSet rs, Class... types) throws DataAccessException; - /* [/java-8] */ + /** * Fetch all data from a formatted string. @@ -8198,7 +8198,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ Cursor fetchLazy(ResultQuery query) throws DataAccessException; - /* [java-8] */ + /** * Execute a {@link ResultQuery} in the context of this DSLContext and return * a stream. @@ -8209,7 +8209,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * @see ResultQuery#stream() */ Stream fetchStream(ResultQuery query) throws DataAccessException; - /* [/java-8] */ + /** * Execute a {@link ResultQuery} in the context of this DSLContext and return @@ -8234,7 +8234,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ R fetchOne(ResultQuery query) throws DataAccessException, TooManyRowsException; - /* [java-8] */ + /** * Execute a {@link ResultQuery} in the context of this DSLContext and return * a record. @@ -8246,7 +8246,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * @see ResultQuery#fetchOptional() */ Optional fetchOptional(ResultQuery query) throws DataAccessException, TooManyRowsException; - /* [/java-8] */ + /** * Execute a {@link ResultQuery} in the context of this @@ -8275,7 +8275,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ T fetchValue(TableField field) throws DataAccessException, TooManyRowsException, InvalidResultException; - /* [java-8] */ + /** * Execute a {@link ResultQuery} in the context of this * DSLContext and return a single value. @@ -8301,7 +8301,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav * than one value */ Optional fetchOptionalValue(TableField field) throws DataAccessException, TooManyRowsException, InvalidResultException; - /* [/java-8] */ + /** * Execute a {@link ResultQuery} in the context of this @@ -8481,7 +8481,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support R fetchOne(Table table, Condition condition) throws DataAccessException, TooManyRowsException; - /* [java-8] */ + /** * Execute and return zero or one record for * 

SELECT * FROM [table]
. @@ -8511,7 +8511,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ @Support Optional fetchOptional(Table table, Condition condition) throws DataAccessException, TooManyRowsException; - /* [/java-8] */ + /** * Execute and return zero or one record for @@ -8567,7 +8567,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav @Support Cursor fetchLazy(Table table, Condition condition) throws DataAccessException; - /* [java-8] */ + /** * Execute and return all records lazily for * 
SELECT * FROM [table]
. @@ -8593,7 +8593,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav */ @Support Stream fetchStream(Table table, Condition condition) throws DataAccessException; - /* [/java-8] */ + /** * Insert one record. diff --git a/jOOQ/src/main/java/org/jooq/DeleteResultStep.java b/jOOQ/src/main/java/org/jooq/DeleteResultStep.java index 7f31857257..35d2c68cc3 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteResultStep.java +++ b/jOOQ/src/main/java/org/jooq/DeleteResultStep.java @@ -103,7 +103,7 @@ public interface DeleteResultStep extends Delete { @Support({ FIREBIRD, POSTGRES }) R fetchOne() throws DataAccessException; - /* [java-8] */ + /** * The record holding returned values as specified by the * {@link UpdateReturningStep}. @@ -115,5 +115,5 @@ public interface DeleteResultStep extends Delete { */ @Support({ FIREBIRD, POSTGRES }) Optional fetchOptional() throws DataAccessException; - /* [/java-8] */ + } diff --git a/jOOQ/src/main/java/org/jooq/ExecuteListenerProvider.java b/jOOQ/src/main/java/org/jooq/ExecuteListenerProvider.java index 49eaa9a8b7..f090211a4a 100644 --- a/jOOQ/src/main/java/org/jooq/ExecuteListenerProvider.java +++ b/jOOQ/src/main/java/org/jooq/ExecuteListenerProvider.java @@ -55,9 +55,9 @@ import org.jooq.impl.DefaultExecuteListenerProvider; * @see ExecuteListener * @see Configuration */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface ExecuteListenerProvider { /** diff --git a/jOOQ/src/main/java/org/jooq/InsertResultStep.java b/jOOQ/src/main/java/org/jooq/InsertResultStep.java index 52d9d05405..9dd0b921d3 100644 --- a/jOOQ/src/main/java/org/jooq/InsertResultStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertResultStep.java @@ -110,7 +110,7 @@ public interface InsertResultStep extends Insert { @Support R fetchOne() throws DataAccessException; - /* [java-8] */ + /** * The record holding returned values as specified by the * {@link InsertReturningStep}. @@ -122,5 +122,5 @@ public interface InsertResultStep extends Insert { */ @Support Optional fetchOptional() throws DataAccessException; - /* [/java-8] */ + } diff --git a/jOOQ/src/main/java/org/jooq/Query.java b/jOOQ/src/main/java/org/jooq/Query.java index a2f2482866..474f4516e1 100644 --- a/jOOQ/src/main/java/org/jooq/Query.java +++ b/jOOQ/src/main/java/org/jooq/Query.java @@ -58,7 +58,7 @@ import org.jooq.impl.DSL; * * @author Lukas Eder */ -public interface Query extends QueryPart, Attachable /* [java-8] */, AutoCloseable /* [/java-8] */ { +public interface Query extends QueryPart, Attachable , AutoCloseable { /** * Execute the query, if it has been created with a proper configuration. @@ -282,9 +282,9 @@ public interface Query extends QueryPart, Attachable /* [java-8] */, AutoCloseab * @throws DataAccessException If something went wrong closing the statement * @see Statement#close() */ - /* [java-8] */ + @Override - /* [/java-8] */ + void close() throws DataAccessException; /** diff --git a/jOOQ/src/main/java/org/jooq/RecordHandler.java b/jOOQ/src/main/java/org/jooq/RecordHandler.java index 13b26d7e9b..058063e487 100644 --- a/jOOQ/src/main/java/org/jooq/RecordHandler.java +++ b/jOOQ/src/main/java/org/jooq/RecordHandler.java @@ -46,9 +46,9 @@ package org.jooq; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface RecordHandler { /** diff --git a/jOOQ/src/main/java/org/jooq/RecordListenerProvider.java b/jOOQ/src/main/java/org/jooq/RecordListenerProvider.java index c59befd8d2..378b5c111e 100644 --- a/jOOQ/src/main/java/org/jooq/RecordListenerProvider.java +++ b/jOOQ/src/main/java/org/jooq/RecordListenerProvider.java @@ -55,9 +55,9 @@ import org.jooq.impl.DefaultRecordListenerProvider; * @see RecordListener * @see Configuration */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface RecordListenerProvider { /** diff --git a/jOOQ/src/main/java/org/jooq/RecordMapper.java b/jOOQ/src/main/java/org/jooq/RecordMapper.java index f9a53b004c..1850f5dfb2 100644 --- a/jOOQ/src/main/java/org/jooq/RecordMapper.java +++ b/jOOQ/src/main/java/org/jooq/RecordMapper.java @@ -47,9 +47,9 @@ package org.jooq; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface RecordMapper { /** diff --git a/jOOQ/src/main/java/org/jooq/RecordMapperProvider.java b/jOOQ/src/main/java/org/jooq/RecordMapperProvider.java index fa8fe72557..d7fbbeb45d 100644 --- a/jOOQ/src/main/java/org/jooq/RecordMapperProvider.java +++ b/jOOQ/src/main/java/org/jooq/RecordMapperProvider.java @@ -85,9 +85,9 @@ import org.jooq.impl.DefaultRecordMapperProvider; * @see RecordMapper * @see Configuration */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface RecordMapperProvider { /** diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java index bb0e1c87e6..96b2f8efad 100644 --- a/jOOQ/src/main/java/org/jooq/ResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java @@ -145,7 +145,7 @@ public interface ResultQuery extends Query, Iterable { @Override Iterator iterator() throws DataAccessException; - /* [java-8] */ + /** * Stream this query. *

@@ -179,7 +179,7 @@ public interface ResultQuery extends Query, Iterable { * @throws DataAccessException if something went wrong executing the query */ Stream stream() throws DataAccessException; - /* [/java-8] */ + /** * Execute the query and "lazily" return the generated result. @@ -665,7 +665,7 @@ public interface ResultQuery extends Query, Iterable { */ Z fetchOneInto(Table table) throws DataAccessException, TooManyRowsException; - /* [java-8] */ + /** * Execute the query and return at most one resulting value for a * field from the generated result. @@ -906,7 +906,7 @@ public interface ResultQuery extends Query, Iterable { * @throws TooManyRowsException if the query returned more than one record */ Optional fetchOptionalInto(Table table) throws DataAccessException, TooManyRowsException; - /* [/java-8] */ + /** * Execute the query and return at most one resulting value for a diff --git a/jOOQ/src/main/java/org/jooq/TransactionalCallable.java b/jOOQ/src/main/java/org/jooq/TransactionalCallable.java index b8de89289e..186595620e 100644 --- a/jOOQ/src/main/java/org/jooq/TransactionalCallable.java +++ b/jOOQ/src/main/java/org/jooq/TransactionalCallable.java @@ -45,9 +45,9 @@ package org.jooq; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface TransactionalCallable { /** diff --git a/jOOQ/src/main/java/org/jooq/TransactionalRunnable.java b/jOOQ/src/main/java/org/jooq/TransactionalRunnable.java index 64e711d59b..89db978936 100644 --- a/jOOQ/src/main/java/org/jooq/TransactionalRunnable.java +++ b/jOOQ/src/main/java/org/jooq/TransactionalRunnable.java @@ -45,9 +45,9 @@ package org.jooq; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface TransactionalRunnable { /** diff --git a/jOOQ/src/main/java/org/jooq/UpdateResultStep.java b/jOOQ/src/main/java/org/jooq/UpdateResultStep.java index e59906e62f..5b320a9217 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateResultStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateResultStep.java @@ -106,7 +106,7 @@ public interface UpdateResultStep extends Update { @Support({ FIREBIRD, POSTGRES }) R fetchOne() throws DataAccessException; - /* [java-8] */ + /** * The record holding returned values as specified by the * {@link UpdateReturningStep}. @@ -118,5 +118,5 @@ public interface UpdateResultStep extends Update { */ @Support({ FIREBIRD, POSTGRES }) Optional fetchOptional() throws DataAccessException; - /* [/java-8] */ + } diff --git a/jOOQ/src/main/java/org/jooq/VisitListenerProvider.java b/jOOQ/src/main/java/org/jooq/VisitListenerProvider.java index 961fa491bf..e1aceac572 100644 --- a/jOOQ/src/main/java/org/jooq/VisitListenerProvider.java +++ b/jOOQ/src/main/java/org/jooq/VisitListenerProvider.java @@ -55,9 +55,9 @@ import org.jooq.impl.DefaultVisitListenerProvider; * @see VisitListener * @see Configuration */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface VisitListenerProvider { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java index 259d0d4f63..6c8d75ea7f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java @@ -282,9 +282,9 @@ abstract class AbstractField extends AbstractQueryPart implements Field { } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final SortField sortAsc(T... sortList) { return sortAsc(Arrays.asList(sortList)); } @@ -302,9 +302,9 @@ abstract class AbstractField extends AbstractQueryPart implements Field { } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final SortField sortDesc(T... sortList) { return sortDesc(Arrays.asList(sortList)); } @@ -1856,9 +1856,9 @@ abstract class AbstractField extends AbstractQueryPart implements Field { @Override @Deprecated - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final Field greatest(T... others) { return DSL.greatest(this, Utils.fields(others).toArray(new Field[0])); } @@ -1871,9 +1871,9 @@ abstract class AbstractField extends AbstractQueryPart implements Field { @Override @Deprecated - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final Field least(T... others) { return DSL.least(this, Utils.fields(others).toArray(new Field[0])); } @@ -1946,9 +1946,9 @@ abstract class AbstractField extends AbstractQueryPart implements Field { @Override @Deprecated - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final Field coalesce(T option, T... options) { return DSL.coalesce(this, Utils.combine(Utils.field(option), Utils.fields(options).toArray(new Field[0]))); } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java b/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java index 81466d44b0..e959387db5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java @@ -63,9 +63,9 @@ abstract class AbstractKey implements Key { private final Table table; private final TableField[] fields; - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + AbstractKey(Table table, TableField... fields) { this.table = table; this.fields = fields; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java index a195aa29eb..79e0229704 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java @@ -66,9 +66,9 @@ public abstract class AbstractKeys { /** * Factory method for unique keys */ - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + protected static UniqueKey createUniqueKey(Table table, TableField... fields) { return new UniqueKeyImpl(table, fields); } @@ -76,9 +76,9 @@ public abstract class AbstractKeys { /** * Factory method for foreign keys */ - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + protected static ForeignKey createForeignKey(UniqueKey key, Table table, TableField... fields) { ForeignKey result = new ReferenceImpl(key, table, fields); diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index 6bf1402013..8e93d09bba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -319,7 +319,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple return fetch().iterator(); } - /* [java-8] */ + @Override public final Stream fetchStream() { return fetchLazy().stream(); @@ -329,7 +329,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple public final Stream stream() { return fetchLazy().stream(); } - /* [/java-8] */ + @Override public final Cursor fetchLazy() { @@ -531,7 +531,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple return record == null ? null : record.into(table); } - /* [java-8] */ + @Override public final Optional fetchOptional(Field field) { return Optional.ofNullable(fetchOne(field)); @@ -621,7 +621,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple public final Optional fetchOptionalInto(Table table) { return Optional.ofNullable(fetchOneInto(table)); } - /* [/java-8] */ + @Override public final T fetchAny(Field field) { diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java index bff5166f77..218f6c0dd3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java +++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java @@ -130,9 +130,9 @@ class BatchSingle implements BatchBindStep { } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final BatchSingle bind(Map... namedBindValues) { List defaultValues = query.getBindValues(); diff --git a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java index aaeee14dd9..6f57d4c3c8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java @@ -209,7 +209,7 @@ class CursorImpl implements Cursor { return iterator; } - /* [java-8] */ + @Override public final Stream stream() throws DataAccessException { return StreamSupport.stream( @@ -221,7 +221,7 @@ class CursorImpl implements Cursor { false ).onClose(() -> close()); } - /* [/java-8] */ + @Override public final boolean hasNext() { @@ -244,7 +244,7 @@ class CursorImpl implements Cursor { return null; } - /* [java-8] */ + @Override public final Optional fetchOptional() throws DataAccessException { return Optional.ofNullable(fetchOne()); @@ -264,7 +264,7 @@ class CursorImpl implements Cursor { public final Optional fetchOptionalInto(Table table) { return Optional.ofNullable(fetchOneInto(table)); } - /* [/java-8] */ + @Override public final Result fetch(int number) { diff --git a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java index 6380a03aba..356085b68e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java @@ -141,9 +141,9 @@ public abstract class DAOImpl, P, T> implements DAO } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final void insert(P... objects) { insert(asList(objects)); } @@ -168,9 +168,9 @@ public abstract class DAOImpl, P, T> implements DAO } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final void update(P... objects) { update(asList(objects)); } @@ -190,9 +190,9 @@ public abstract class DAOImpl, P, T> implements DAO } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final void delete(P... objects) { delete(asList(objects)); } @@ -209,9 +209,9 @@ public abstract class DAOImpl, P, T> implements DAO } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final void deleteById(T... ids) { deleteById(asList(ids)); } @@ -296,12 +296,12 @@ public abstract class DAOImpl, P, T> implements DAO return record == null ? null : mapper().map(record); } - /* [java-8] */ + @Override public final Optional

fetchOptional(Field field, Z value) { return Optional.ofNullable(fetchOne(field, value)); } - /* [/java-8] */ + @Override public final Table getTable() { diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 10fd5a3982..cdbd26760c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -12767,9 +12767,9 @@ public class DSL { * * */ - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + @Support({ H2, HSQLDB, POSTGRES }) public static Field array(Field... fields) { return array(Arrays.asList(fields)); @@ -13951,7 +13951,7 @@ public class DSL { return value((Object) value, SQLDataType.TIMESTAMP); } - /* [java-8] */ + /** * A synonym for {@link #val(Object)} to be used in Scala and Groovy, where * val is a reserved keyword. @@ -14001,7 +14001,7 @@ public class DSL { public static Param value(OffsetDateTime value) { return value((Object) value, SQLDataType.OFFSETDATETIME); } - /* [/java-8] */ + /** * A synonym for {@link #val(Object)} to be used in Scala and Groovy, where @@ -14568,7 +14568,7 @@ public class DSL { return inline((Object) value, SQLDataType.TIMESTAMP); } - /* [java-8] */ + /** * Create a bind value that is always inlined. *

@@ -14668,7 +14668,7 @@ public class DSL { public static Param inline(OffsetDateTime value) { return inline((Object) value, SQLDataType.OFFSETDATETIME); } - /* [/java-8] */ + /** * Create a bind value that is always inlined. @@ -15055,7 +15055,7 @@ public class DSL { return val((Object) value, SQLDataType.TIMESTAMP); } - /* [java-8] */ + /** * Get a bind value. * @@ -15100,7 +15100,7 @@ public class DSL { public static Param val(OffsetDateTime value) { return val((Object) value, SQLDataType.OFFSETDATETIME); } - /* [/java-8] */ + /** * Get a bind value. diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index b2e9313bfe..adfa0689fb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -323,14 +323,14 @@ public class DefaultBinding implements Binding { } } - /* [java-8] */ + if (type == OffsetTime.class || type == OffsetDateTime.class) { switch (ctx.family()) { case POSTGRES: return true; } } - /* [/java-8] */ + return false; } @@ -993,7 +993,7 @@ public class DefaultBinding implements Binding { } } - /* [java-8] */ + else if (actualType == LocalDate.class) { ctx.statement().setDate(ctx.index(), Date.valueOf((LocalDate) value)); } @@ -1009,7 +1009,7 @@ public class DefaultBinding implements Binding { else if (actualType == OffsetDateTime.class) { ctx.statement().setString(ctx.index(), value.toString()); } - /* [/java-8] */ + // [#566] Interval data types are best bound as Strings else if (actualType == YearToMonth.class) { @@ -1314,7 +1314,7 @@ public class DefaultBinding implements Binding { else if (type == Integer.class) { result = (T) wasNull(ctx.resultSet(), Integer.valueOf(ctx.resultSet().getInt(ctx.index()))); } - /* [java-8] */ + else if (type == LocalDate.class) { result = (T) localDate(getDate(ctx.configuration().dialect(), ctx.resultSet(), ctx.index())); } @@ -1324,18 +1324,18 @@ public class DefaultBinding implements Binding { else if (type == LocalDateTime.class) { result = (T) localDateTime(getTimestamp(ctx.configuration().dialect(), ctx.resultSet(), ctx.index())); } - /* [/java-8] */ + else if (type == Long.class) { result = (T) wasNull(ctx.resultSet(), Long.valueOf(ctx.resultSet().getLong(ctx.index()))); } - /* [java-8] */ + else if (type == OffsetTime.class) { result = (T) offsetTime(ctx.resultSet().getString(ctx.index())); } else if (type == OffsetDateTime.class) { result = (T) offsetDateTime(ctx.resultSet().getString(ctx.index())); } - /* [/java-8] */ + else if (type == Short.class) { result = (T) wasNull(ctx.resultSet(), Short.valueOf(ctx.resultSet().getShort(ctx.index()))); } @@ -1456,7 +1456,7 @@ public class DefaultBinding implements Binding { ctx.value(converter.from(result)); } - /* [java-8] */ + private final LocalDate localDate(Date date) { return date == null ? null : date.toLocalDate(); } @@ -1495,7 +1495,7 @@ public class DefaultBinding implements Binding { return OffsetDateTime.parse(string); } - /* [/java-8] */ + @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 13e707666d..27006d10bb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -368,9 +368,9 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri // [#3718] Use reflection to support also JDBC 4.0 catch (Exception suppress) { - /* [java-8] */ + cause.addSuppressed(suppress); - /* [/java-8] */ + } if (cause instanceof RuntimeException) { @@ -602,7 +602,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return resultQuery(sql, parts).fetchLazy(); } - /* [java-8] */ + @Override public Stream fetchStream(SQL sql) { return resultQuery(sql).stream(); @@ -622,7 +622,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Stream fetchStream(String sql, QueryPart... parts) { return resultQuery(sql, parts).stream(); } - /* [/java-8] */ + @Override public Results fetchMany(SQL sql) { @@ -664,7 +664,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return resultQuery(sql, parts).fetchOne(); } - /* [java-8] */ + @Override public Optional fetchOptional(SQL sql) { return Optional.ofNullable(fetchOne(sql)); @@ -684,7 +684,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Optional fetchOptional(String sql, QueryPart... parts) { return Optional.ofNullable(fetchOne(sql, parts)); } - /* [/java-8] */ + @Override public Object fetchValue(SQL sql) { @@ -706,7 +706,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return fetchValue((ResultQuery) resultQuery(sql, parts)); } - /* [java-8] */ + @Override public Optional fetchOptionalValue(SQL sql) { return Optional.ofNullable(fetchValue(sql)); @@ -726,7 +726,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Optional fetchOptionalValue(String sql, QueryPart... parts) { return Optional.ofNullable(fetchValue(sql, parts)); } - /* [/java-8] */ + @Override public List fetchValues(SQL sql) { @@ -832,7 +832,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return Utils.fetchOne(fetchLazy(rs, types)); } - /* [java-8] */ + @Override public Optional fetchOptional(ResultSet rs) { return Optional.ofNullable(fetchOne(rs)); @@ -852,7 +852,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Optional fetchOptional(ResultSet rs, Class... types) { return Optional.ofNullable(fetchOne(rs, types)); } - /* [/java-8] */ + @Override public Object fetchValue(ResultSet rs) { @@ -874,7 +874,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return (T) value1((Record1) fetchOne(rs, type)); } - /* [java-8] */ + @Override public Optional fetchOptionalValue(ResultSet rs) { return Optional.ofNullable(fetchValue(rs)); @@ -894,7 +894,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Optional fetchOptionalValue(ResultSet rs, Class type) { return Optional.ofNullable(fetchValue(rs, type)); } - /* [/java-8] */ + @Override public List fetchValues(ResultSet rs) { @@ -958,7 +958,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return fetchLazy(rs, Utils.dataTypes(types)); } - /* [java-8] */ + @Override public Stream fetchStream(ResultSet rs) { return fetchLazy(rs).stream(); @@ -978,7 +978,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Stream fetchStream(ResultSet rs, Class... types) { return fetchLazy(rs, types).stream(); } - /* [/java-8] */ + @Override public Result fetchFromTXT(String string) { @@ -2839,7 +2839,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } } - /* [java-8] */ + @Override public Stream fetchStream(ResultQuery query) { final Configuration previous = Utils.getConfiguration(query); @@ -2852,7 +2852,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri query.attach(previous); } } - /* [/java-8] */ + @Override public Results fetchMany(ResultQuery query) { @@ -2880,12 +2880,12 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } } - /* [java-8] */ + @Override public Optional fetchOptional(ResultQuery query) { return Optional.ofNullable(fetchOne(query)); } - /* [/java-8] */ + @Override public > T fetchValue(ResultQuery query) { @@ -2905,7 +2905,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return fetchValue(select(field).from(field.getTable())); } - /* [java-8] */ + @Override public > Optional fetchOptionalValue(ResultQuery query) { return Optional.ofNullable(fetchValue(query)); @@ -2915,7 +2915,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Optional fetchOptionalValue(TableField field) { return Optional.ofNullable(fetchValue(field)); } - /* [/java-8] */ + @Override public > List fetchValues(ResultQuery query) { @@ -3004,7 +3004,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return Utils.fetchOne(fetchLazy(table, condition)); } - /* [java-8] */ + @Override public Optional fetchOptional(Table table) { return Optional.ofNullable(fetchOne(table)); @@ -3014,7 +3014,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Optional fetchOptional(Table table, Condition condition) { return Optional.ofNullable(fetchOne(table, condition)); } - /* [/java-8] */ + @Override public R fetchAny(Table table) { @@ -3036,7 +3036,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return selectFrom(table).where(condition).fetchLazy(); } - /* [java-8] */ + @Override public Stream fetchStream(Table table) { return fetchStream(table, trueCondition()); @@ -3046,7 +3046,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri public Stream fetchStream(Table table, Condition condition) { return selectFrom(table).where(condition).stream(); } - /* [/java-8] */ + @Override public > int executeInsert(R record) { diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index 9d835dedc8..a9c0453589 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -775,9 +775,9 @@ public class DefaultDataType implements DataType { @Override public final boolean isDateTime() { return java.util.Date.class.isAssignableFrom(type) - /* [java-8] */ + || java.time.temporal.Temporal.class.isAssignableFrom(type) - /* [/java-8] */ + ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java index 7e955a5c7c..a257e6532b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java @@ -286,10 +286,10 @@ class DeleteImpl return getDelegate().getReturnedRecord(); } - /* [java-8] */ + @Override public final Optional fetchOptional() { return Optional.ofNullable(fetchOne()); } - /* [/java-8] */ + } diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java index fdf57839bb..681d3d9c1b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java @@ -669,10 +669,10 @@ class InsertImpl fetchOptional() { return Optional.ofNullable(fetchOne()); } - /* [/java-8] */ + } diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordFactory.java b/jOOQ/src/main/java/org/jooq/impl/RecordFactory.java index 8a2110190b..da61df35cf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordFactory.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordFactory.java @@ -46,9 +46,9 @@ import org.jooq.Record; * @author Lukas Eder * @author Arnaud Roger */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + interface RecordFactory { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java index 02d63245ad..f59ce219c8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java @@ -73,9 +73,9 @@ class ReferenceImpl extends AbstractKey i private final UniqueKey key; - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + ReferenceImpl(UniqueKey key, Table table, TableField... fields) { super(table, fields); @@ -93,9 +93,9 @@ class ReferenceImpl extends AbstractKey i } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final Result fetchParents(R... records) { return fetchParents(list(records)); } @@ -106,9 +106,9 @@ class ReferenceImpl extends AbstractKey i } @Override - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public final Result fetchChildren(O... records) { return fetchChildren(list(records)); } diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java index 12d3cf41bd..07aed87d0e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java @@ -272,7 +272,7 @@ public final class SQLDataType { */ public static final DataType INTERVALDAYTOSECOND = new DefaultDataType(null, DayToSecond.class, "interval day to second"); - /* [java-8] */ + // ------------------------------------------------------------------------- // JSR310 types // ------------------------------------------------------------------------- @@ -315,7 +315,7 @@ public final class SQLDataType { * An alias for {@link #OFFSETDATETIME} */ public static final DataType TIMESTAMPWITHTIMEZONE = OFFSETDATETIME; - /* [/java-8] */ + // ------------------------------------------------------------------------- // Binary types diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java index eb018cb33e..6230f4d287 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java @@ -2703,7 +2703,7 @@ class SelectImpl fetchStream() { return getDelegate().fetchStream(); @@ -2713,7 +2713,7 @@ class SelectImpl stream() { return getDelegate().stream(); } - /* [/java-8] */ + @Override public final Cursor fetchLazy() { @@ -2881,7 +2881,7 @@ class SelectImpl Optional fetchOptional(Field field) { return getDelegate().fetchOptional(field); @@ -2971,7 +2971,7 @@ class SelectImpl Optional fetchOptionalInto(Table table) { return getDelegate().fetchOptionalInto(table); } - /* [/java-8] */ + @Override public final T fetchAny(Field field) { diff --git a/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java b/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java index 21ae8efd9c..d146790cf8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java @@ -63,9 +63,9 @@ class UniqueKeyImpl extends AbstractKey implements UniqueKe final List> references; - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + UniqueKeyImpl(Table table, TableField... fields) { super(table, fields); diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java index d968f103ed..8e7c255d8d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java @@ -741,10 +741,10 @@ final class UpdateImpl return getDelegate().getReturnedRecord(); } - /* [java-8] */ + @Override public final Optional fetchOptional() { return Optional.ofNullable(fetchOne()); } - /* [/java-8] */ + } diff --git a/jOOQ/src/main/java/org/jooq/impl/Utils.java b/jOOQ/src/main/java/org/jooq/impl/Utils.java index ebab6dacac..2656e16bd4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Utils.java +++ b/jOOQ/src/main/java/org/jooq/impl/Utils.java @@ -1154,9 +1154,9 @@ final class Utils { /** * Create a new array */ - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + static final T[] array(T... array) { return array; } @@ -1165,9 +1165,9 @@ final class Utils { * Use this rather than {@link Arrays#asList(Object...)} for * null-safety */ - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + static final List list(T... array) { return array == null ? Collections.emptyList() : Arrays.asList(array); } diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java index a3ab6a64c0..c1db0b5779 100644 --- a/jOOQ/src/main/java/org/jooq/tools/Convert.java +++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java @@ -463,11 +463,11 @@ public final class Convert { } } - /* [java-8] */ + else if (toClass == Optional.class) { return (U) Optional.empty(); } - /* [/java-8] */ + else { return null; @@ -504,11 +504,11 @@ public final class Convert { } } - /* [java-8] */ + else if (toClass == Optional.class) { return (U) Optional.of(from); } - /* [/java-8] */ + // All types can be converted into String else if (toClass == String.class) { @@ -581,11 +581,11 @@ public final class Convert { return (U) Long.valueOf(((java.util.Date) from).getTime()); } - /* [java-8] */ + if (Temporal.class.isAssignableFrom(fromClass)) { return (U) Long.valueOf(millis((Temporal) from)); } - /* [/java-8] */ + try { return (U) Long.valueOf(new BigDecimal(from.toString().trim()).longValue()); @@ -653,11 +653,11 @@ public final class Convert { return (U) ulong(((java.util.Date) from).getTime()); } - /* [java-8] */ + if (Temporal.class.isAssignableFrom(fromClass)) { return (U) ulong(millis((Temporal) from)); } - /* [/java-8] */ + try { return (U) ulong(new BigDecimal(from.toString().trim()).toBigInteger().toString()); @@ -784,22 +784,22 @@ public final class Convert { return toDate(((java.util.Date) from).getTime(), toClass); } - /* [java-8] */ + else if (Temporal.class.isAssignableFrom(fromClass)) { return toDate(convert(from, Long.class), toClass); } - /* [/java-8] */ + // Long may also be converted into a date type else if ((fromClass == Long.class || fromClass == long.class) && java.util.Date.class.isAssignableFrom(toClass)) { return toDate((Long) from, toClass); } - /* [java-8] */ + else if ((fromClass == Long.class || fromClass == long.class) && Temporal.class.isAssignableFrom(toClass)) { return toDate((Long) from, toClass); } - /* [/java-8] */ + // [#1501] Strings can be converted to java.sql.Date else if ((fromClass == String.class) && toClass == java.sql.Date.class) { @@ -831,7 +831,7 @@ public final class Convert { } } - /* [java-8] */ + else if ((fromClass == String.class) && toClass == LocalDate.class) { // Try "lenient" ISO date formats first @@ -927,7 +927,7 @@ public final class Convert { } } } - /* [/java-8] */ + // [#1448] Some users may find it useful to convert string // literals to Enum values without a Converter @@ -1041,7 +1041,7 @@ public final class Convert { return (X) calendar; } - /* [java-8] */ + else if (toClass == LocalDate.class) { return (X) new Date(time).toLocalDate(); } @@ -1060,12 +1060,12 @@ public final class Convert { else if (toClass == Instant.class) { return (X) new Timestamp(time).toLocalDateTime().atOffset(OffsetDateTime.now().getOffset()).toInstant(); } - /* [/java-8] */ + throw fail(time, toClass); } - /* [java-8] */ + private static final long millis(Temporal temporal) { // java.sql.* temporal types: @@ -1091,7 +1091,7 @@ public final class Convert { throw fail(temporal, Long.class); } - /* [/java-8] */ + /** * Some databases do not implement the standard very well. Specifically, diff --git a/jOOQ/src/main/java/org/jooq/tools/StringUtils.java b/jOOQ/src/main/java/org/jooq/tools/StringUtils.java index d38f5acab3..f1b2cbf8b4 100644 --- a/jOOQ/src/main/java/org/jooq/tools/StringUtils.java +++ b/jOOQ/src/main/java/org/jooq/tools/StringUtils.java @@ -1033,9 +1033,9 @@ public final class StringUtils { * @since 2.0 * @since 3.0 Changed signature to use varargs */ - /* [java-8] */ + @SafeVarargs - /* [/java-8] */ + public static String join(T... elements) { return join(elements, null); } diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockCallable.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockCallable.java index 8a5caea5ae..ff3229648d 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockCallable.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockCallable.java @@ -47,9 +47,9 @@ import org.jooq.Configuration; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface MockCallable { /** diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java index ff973e6f3b..534ac4c6ce 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java @@ -60,9 +60,9 @@ import org.jooq.ResultQuery; * @author Lukas Eder * @see MockConnection */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface MockDataProvider { /** diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockRunnable.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockRunnable.java index 7195e35f1a..8777f2ab7d 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockRunnable.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockRunnable.java @@ -47,9 +47,9 @@ import org.jooq.Configuration; * * @author Lukas Eder */ -/* [java-8] */ + @FunctionalInterface -/* [/java-8] */ + public interface MockRunnable { /**