diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml index 5df49954ee..37f32c0dc0 100644 --- a/jOOQ-meta-extensions/pom.xml +++ b/jOOQ-meta-extensions/pom.xml @@ -52,6 +52,12 @@ com.h2database h2 + + org.jetbrains + annotations + provided + true + diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/AbstractInterpretingDatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/AbstractInterpretingDatabase.java index f8796d99d3..3baa97c82b 100644 --- a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/AbstractInterpretingDatabase.java +++ b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/AbstractInterpretingDatabase.java @@ -40,19 +40,19 @@ package org.jooq.meta.extensions; import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.UUID; import org.jooq.DSLContext; -import org.jooq.Internal; import org.jooq.exception.DataAccessException; import org.jooq.impl.DSL; import org.jooq.meta.SchemaDefinition; import org.jooq.meta.h2.H2Database; import org.jooq.tools.jdbc.JDBCUtils; +import org.jetbrains.annotations.ApiStatus.Internal; + /** * A common base class for "interpreting" databases, which interpret a third * party meta format, applying that to an in-memory H2 database, and reverse diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index 8406a230ee..8224b14874 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -48,6 +48,12 @@ org.jooq jooq + + org.jetbrains + annotations + provided + true + diff --git a/jOOQ-meta/src/main/java/module-info.java b/jOOQ-meta/src/main/java/module-info.java index 5d0fa92f9a..431f40fc8b 100644 --- a/jOOQ-meta/src/main/java/module-info.java +++ b/jOOQ-meta/src/main/java/module-info.java @@ -6,6 +6,9 @@ module org.jooq.meta { // Other jOOQ modules requires transitive org.jooq; + // Nullability annotations for better Kotlin interop + requires static org.jetbrains.annotations; + // JAXB is used optionally for loading a variety of XML content, including // - Settings (org.jooq.conf) // - InformationSchema (org.jooq.util.xml.jaxb) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/ResultQueryDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/ResultQueryDatabase.java index 9ceab887ea..ac62b0025a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/ResultQueryDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/ResultQueryDatabase.java @@ -38,15 +38,15 @@ package org.jooq.meta; import java.math.BigDecimal; -import java.math.BigInteger; import java.util.List; -import org.jooq.Internal; import org.jooq.Meta; import org.jooq.Record12; import org.jooq.Record6; import org.jooq.ResultQuery; +import org.jetbrains.annotations.ApiStatus.Internal; + /** * An interface for all {@link AbstractDatabase} implementations that can * produce {@link ResultQuery} objects to query meta data. diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java index 9676bd646c..aa414f8316 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java @@ -55,7 +55,7 @@ import org.jooq.UniqueKey; * @deprecated - [#6875] [#7158] - 3.11.0 - Please re-generate your code */ @Deprecated -@org.jetbrains.annotations.ApiStatus.Internal +@org.jooq.Internal public abstract class AbstractKeys { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java index 91e588c3f7..5e980dc71e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -162,7 +162,7 @@ import org.jooq.tools.reflect.Reflect; * * @author Lukas Eder */ -@org.jetbrains.annotations.ApiStatus.Internal +@org.jooq.Internal public abstract class AbstractRoutine extends AbstractNamed diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java index 54a702257a..4a6498a68b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java @@ -394,6 +394,8 @@ package org.jooq.impl; + + diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java index 9048071a71..f424b7609b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java @@ -43,21 +43,22 @@ import static org.jooq.impl.Tools.getMappedCatalog; import java.util.Collections; import java.util.List; +import java.util.function.BiFunction; +import java.util.function.Predicate; import java.util.stream.Stream; import org.jooq.Catalog; import org.jooq.Clause; import org.jooq.Comment; import org.jooq.Context; +import org.jooq.Function1; import org.jooq.Name; -import org.jooq.QueryPart; -// ... import org.jooq.Schema; // ... +import org.jooq.QueryPart; +// ... import org.jooq.tools.StringUtils; -import org.jetbrains.annotations.ApiStatus.Internal; - /** * A common base class for database catalogs *

@@ -65,7 +66,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class CatalogImpl extends AbstractNamed implements Catalog { private static final Clause[] CLAUSES = { CATALOG, CATALOG_REFERENCE }; static final Catalog DEFAULT_CATALOG = new CatalogImpl(""); diff --git a/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java index 81d58485ba..0dc26dfb67 100644 --- a/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java @@ -46,8 +46,6 @@ import org.jooq.Field; import org.jooq.Row; import org.jooq.TableField; -import org.jetbrains.annotations.ApiStatus.Internal; - /** * A record implementation for a record originating from a single table *

@@ -55,7 +53,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class EmbeddableRecordImpl> extends AbstractRecord implements EmbeddableRecord { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/Internal.java b/jOOQ/src/main/java/org/jooq/impl/Internal.java index 6a497de1c6..a88b890a49 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Internal.java +++ b/jOOQ/src/main/java/org/jooq/impl/Internal.java @@ -100,7 +100,6 @@ import org.reactivestreams.Subscription; * @author Lukas Eder */ @org.jooq.Internal -@org.jetbrains.annotations.ApiStatus.Internal public final class Internal { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java b/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java index 05e610c1e1..0ea49589ad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java @@ -38,17 +38,19 @@ package org.jooq.impl; import java.util.List; +import java.util.function.BiFunction; +import java.util.function.Predicate; import java.util.stream.Stream; import org.jooq.Catalog; import org.jooq.Context; +import org.jooq.Function1; +import org.jooq.Internal; import org.jooq.Name; -import org.jooq.QueryPart; -// ... import org.jooq.Schema; // ... - -import org.jetbrains.annotations.ApiStatus.Internal; +import org.jooq.QueryPart; +// ... /** * A schema that references a lazy initialisable {@link Catalog} singleton, for diff --git a/jOOQ/src/main/java/org/jooq/impl/LazySchema.java b/jOOQ/src/main/java/org/jooq/impl/LazySchema.java index 6c74127047..ef1e3cc2ac 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazySchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazySchema.java @@ -38,6 +38,8 @@ package org.jooq.impl; import java.util.List; +import java.util.function.BiFunction; +import java.util.function.Predicate; import java.util.stream.Stream; import org.jooq.Catalog; @@ -45,18 +47,18 @@ import org.jooq.Comment; import org.jooq.Context; import org.jooq.Domain; import org.jooq.ForeignKey; +import org.jooq.Function1; import org.jooq.Index; +import org.jooq.Internal; import org.jooq.Name; -import org.jooq.QueryPart; -// ... import org.jooq.Schema; import org.jooq.Sequence; import org.jooq.Table; // ... import org.jooq.UDT; import org.jooq.UniqueKey; - -import org.jetbrains.annotations.ApiStatus.Internal; +import org.jooq.QueryPart; +// ... /** * A schema that references a lazy initialisable {@link Schema} singleton, for diff --git a/jOOQ/src/main/java/org/jooq/impl/LazySupplier.java b/jOOQ/src/main/java/org/jooq/impl/LazySupplier.java index 70bc35b110..5cbe4a597f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazySupplier.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazySupplier.java @@ -40,7 +40,7 @@ package org.jooq.impl; import java.io.Serializable; import java.util.function.Supplier; -import org.jetbrains.annotations.ApiStatus.Internal; +import org.jooq.Internal; /** * A lazy supplier diff --git a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java index b555f70462..5a158fb754 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java @@ -37,16 +37,18 @@ */ package org.jooq.impl; +import java.util.function.BiFunction; +import java.util.function.Predicate; + import org.jooq.Catalog; import org.jooq.Context; +import org.jooq.Function1; import org.jooq.Package; -import org.jooq.QueryPart; -// ... import org.jooq.SQLDialect; import org.jooq.Schema; // ... - -import org.jetbrains.annotations.ApiStatus.Internal; +import org.jooq.QueryPart; +// ... /** * A default implementation for packages (containers of stored procedures and @@ -58,7 +60,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class PackageImpl extends AbstractNamed implements Package { private Schema schema; diff --git a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java index e1afe7ff4b..50bb76f755 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java @@ -49,6 +49,8 @@ import static org.jooq.tools.StringUtils.defaultIfNull; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.function.BiFunction; +import java.util.function.Predicate; import java.util.stream.Stream; import org.jooq.Catalog; @@ -57,20 +59,19 @@ import org.jooq.Comment; import org.jooq.Context; import org.jooq.Domain; import org.jooq.ForeignKey; +import org.jooq.Function1; import org.jooq.Index; import org.jooq.Name; -import org.jooq.QueryPart; -// ... import org.jooq.Schema; import org.jooq.Sequence; import org.jooq.Table; // ... import org.jooq.UDT; import org.jooq.UniqueKey; +import org.jooq.QueryPart; +// ... import org.jooq.tools.StringUtils; -import org.jetbrains.annotations.ApiStatus.Internal; - /** * A common base class for database schemata *

@@ -78,7 +79,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class SchemaImpl extends AbstractNamed implements Schema { private static final Clause[] CLAUSES = { SCHEMA, SCHEMA_REFERENCE }; diff --git a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java index f2385262e7..d3cb9db28c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java @@ -74,9 +74,12 @@ import org.jooq.SQLDialect; import org.jooq.Schema; import org.jooq.Select; import org.jooq.Sequence; +import org.jooq.exception.SQLDialectNotSupportedException; +import org.jooq.impl.QOM.UEmpty; import org.jooq.impl.QOM.UNotYetImplemented; +import org.jooq.impl.QOM.UTransient; -import org.jetbrains.annotations.ApiStatus.Internal; +import org.jetbrains.annotations.Nullable; /** * A common base class for sequences @@ -85,7 +88,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class SequenceImpl extends AbstractTypedNamed diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java index 55c537f973..57b5e56079 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -62,6 +62,8 @@ import static org.jooq.tools.StringUtils.defaultIfNull; import java.util.Arrays; import java.util.Set; +import java.util.function.BiFunction; +import java.util.function.Predicate; import java.util.stream.Stream; import org.jooq.Clause; @@ -69,6 +71,7 @@ import org.jooq.Comment; import org.jooq.Context; import org.jooq.Field; import org.jooq.ForeignKey; +import org.jooq.Function1; import org.jooq.Name; // ... import org.jooq.QueryPart; @@ -84,8 +87,6 @@ import org.jooq.TableOptions; import org.jooq.impl.QOM.UNotYetImplemented; import org.jooq.tools.StringUtils; -import org.jetbrains.annotations.ApiStatus.Internal; - /** * A common base type for tables *

@@ -93,7 +94,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class TableImpl extends AbstractTable @@ -257,7 +258,7 @@ implements * This method is used by generated code of table valued functions. Do not * call this method directly. */ - @Internal + @org.jooq.Internal protected boolean aliased() { return getAliasedTable() != null; } @@ -268,13 +269,13 @@ implements * This method is used by generated code of synthetic views. Do not * call this method directly. */ - @Internal + @org.jooq.Internal protected boolean isSynthetic() { return false; } @Override - @Internal + @org.jooq.Internal public final boolean isSimple(Context ctx) { return alias == null && (parameters == null || parameters.length < 2); } diff --git a/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java index ddee9c6aac..5e30157a25 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java @@ -39,6 +39,7 @@ package org.jooq.impl; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; +import static java.util.Arrays.asList; // ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; @@ -49,9 +50,13 @@ import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.conf.SettingsTools.updatablePrimaryKeys; import static org.jooq.conf.WriteIfReadonly.IGNORE; +import static org.jooq.conf.WriteIfReadonly.THROW; +import static org.jooq.conf.WriteIfReadonly.WRITE; import static org.jooq.impl.RecordDelegate.delegate; import static org.jooq.impl.RecordDelegate.RecordLifecycleType.INSERT; import static org.jooq.impl.Tools.EMPTY_FIELD; +import static org.jooq.impl.Tools.collect; +import static org.jooq.impl.Tools.filter; import static org.jooq.impl.Tools.indexOrFail; import static org.jooq.impl.Tools.settings; import static org.jooq.impl.Tools.BooleanDataKey.DATA_OMIT_RETURNING_CLAUSE; @@ -72,7 +77,9 @@ import org.jooq.DataType; import org.jooq.Field; import org.jooq.ForeignKey; import org.jooq.Identity; +import org.jooq.Insert; import org.jooq.InsertQuery; +// ... import org.jooq.Record; import org.jooq.SQLDialect; import org.jooq.StoreQuery; @@ -81,12 +88,12 @@ import org.jooq.TableField; import org.jooq.TableRecord; import org.jooq.UniqueKey; import org.jooq.UpdatableRecord; +import org.jooq.Update; import org.jooq.conf.Settings; import org.jooq.conf.WriteIfReadonly; import org.jooq.exception.DataTypeException; import org.jooq.tools.JooqLogger; - -import org.jetbrains.annotations.ApiStatus.Internal; +import org.jooq.tools.StringUtils; /** * A record implementation for a record originating from a single table @@ -95,7 +102,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class TableRecordImpl> extends AbstractQualifiedRecord implements TableRecord { private static final JooqLogger log = JooqLogger.getLogger(TableRecordImpl.class); private static final Set REFRESH_GENERATED_KEYS = SQLDialect.supportedBy(DERBY, H2, MARIADB, MYSQL); diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java index a4cca8402f..7f3507d2e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java @@ -47,15 +47,17 @@ import org.jooq.DataType; import org.jooq.Name; import org.jooq.Named; import org.jooq.Package; +import org.jooq.QueryPart; import org.jooq.Record; import org.jooq.Row; import org.jooq.Schema; import org.jooq.UDT; import org.jooq.UDTField; import org.jooq.UDTRecord; +import org.jooq.QueryPart; import org.jooq.impl.QOM.UNotYetImplemented; -import org.jetbrains.annotations.ApiStatus.Internal; +import org.jetbrains.annotations.Nullable; /** * A common base type for UDT's @@ -64,7 +66,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class UDTImpl> extends AbstractNamed diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java index 53b3e8ae4e..70e118f8f3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java @@ -40,8 +40,6 @@ package org.jooq.impl; import org.jooq.UDT; import org.jooq.UDTRecord; -import org.jetbrains.annotations.ApiStatus.Internal; - /** * A record implementation for a record originating from a single UDT *

@@ -49,7 +47,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class UDTRecordImpl> extends AbstractQualifiedRecord implements UDTRecord { public UDTRecordImpl(UDT udt) { diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java index 1e6eab1153..84741ac4b7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java @@ -89,8 +89,6 @@ import org.jooq.exception.NoDataFoundException; import org.jooq.tools.JooqLogger; import org.jooq.tools.StringUtils; -import org.jetbrains.annotations.ApiStatus.Internal; - /** * A record implementation for a record holding a primary key *

@@ -98,7 +96,7 @@ import org.jetbrains.annotations.ApiStatus.Internal; * * @author Lukas Eder */ -@Internal +@org.jooq.Internal public class UpdatableRecordImpl> extends TableRecordImpl implements UpdatableRecord { private static final JooqLogger log = JooqLogger.getLogger(UpdatableRecordImpl.class); private static final Set NO_SUPPORT_FOR_UPDATE = SQLDialect.supportedBy(SQLITE);