github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#12533] Move more Internal annotation usage to JetBrains

Browse Source
This commit is contained in:
Lukas Eder 2022-02-15 09:07:27 +01:00
parent 19f56d553e
commit be001af097
22 changed files with 84 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ-meta-extensions/pom.xml
View File

@ -52,6 +52,12 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>

4
jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/AbstractInterpretingDatabase.java
View File

@ -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

6
jOOQ-meta/pom.xml
View File

@ -48,6 +48,12 @@
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>

3
jOOQ-meta/src/main/java/module-info.java
View File

@ -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)

4
jOOQ-meta/src/main/java/org/jooq/meta/ResultQueryDatabase.java
View File

@ -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.

2
jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java
View File

@ -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 {
/**

2
jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
View File

@ -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<T>
extends
AbstractNamed

2
jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java
View File

@ -394,6 +394,8 @@ package org.jooq.impl;

11
jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
View File

@ -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
* <p>
@ -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("");

4
jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java
View File

@ -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
* <p>
@ -55,7 +53,7 @@ import org.jetbrains.annotations.ApiStatus.Internal;
*
* @author Lukas Eder
*/
@Internal
@org.jooq.Internal
public class EmbeddableRecordImpl<R extends EmbeddableRecord<R>> extends AbstractRecord implements EmbeddableRecord<R> {
/**

1
jOOQ/src/main/java/org/jooq/impl/Internal.java
View File

@ -100,7 +100,6 @@ import org.reactivestreams.Subscription;
* @author Lukas Eder
*/
@org.jooq.Internal
@org.jetbrains.annotations.ApiStatus.Internal
public final class Internal {
/**

10
jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java
View File

@ -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

10
jOOQ/src/main/java/org/jooq/impl/LazySchema.java
View File

@ -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

2
jOOQ/src/main/java/org/jooq/impl/LazySupplier.java
View File

@ -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

12
jOOQ/src/main/java/org/jooq/impl/PackageImpl.java
View File

@ -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;

11
jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
View File

@ -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
* <p>
@ -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 };

7
jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
View File

@ -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<T extends Number>
extends
AbstractTypedNamed<T>

13
jOOQ/src/main/java/org/jooq/impl/TableImpl.java
View File

@ -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
* <p>
@ -93,7 +94,7 @@ import org.jetbrains.annotations.ApiStatus.Internal;
*
* @author Lukas Eder
*/
@Internal
@org.jooq.Internal
public class TableImpl<R extends Record>
extends
AbstractTable<R>
@ -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);
}

13
jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java
View File

@ -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<R extends TableRecord<R>> extends AbstractQualifiedRecord<R> implements TableRecord<R> {
private static final JooqLogger log = JooqLogger.getLogger(TableRecordImpl.class);
private static final Set<SQLDialect> REFRESH_GENERATED_KEYS = SQLDialect.supportedBy(DERBY, H2, MARIADB, MYSQL);

6
jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
View File

@ -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<R extends UDTRecord<R>>
extends
AbstractNamed

4
jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java
View File

@ -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
* <p>
@ -49,7 +47,7 @@ import org.jetbrains.annotations.ApiStatus.Internal;
*
* @author Lukas Eder
*/
@Internal
@org.jooq.Internal
public class UDTRecordImpl<R extends UDTRecord<R>> extends AbstractQualifiedRecord<R> implements UDTRecord<R> {
public UDTRecordImpl(UDT<R> udt) {

4
jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
View File

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