From c64f5e9344aaa518f21dfd60dda112c0b87bdbef Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 15 Feb 2022 08:41:01 +0100 Subject: [PATCH] [jOOQ/jOOQ#12533] Move more Internal annotation usage to JetBrains --- jOOQ/src/main/java/org/jooq/Internal.java | 1 + .../main/java/org/jooq/impl/AbstractKeys.java | 2 +- .../java/org/jooq/impl/AbstractRoutine.java | 2 +- .../java/org/jooq/impl/ArrayRecordImpl.java | 2 - .../main/java/org/jooq/impl/CatalogImpl.java | 11 +++-- .../org/jooq/impl/DefaultCommitProvider.java | 4 +- .../java/org/jooq/impl/DefaultDataType.java | 4 +- .../org/jooq/impl/EmbeddableRecordImpl.java | 4 +- .../src/main/java/org/jooq/impl/Internal.java | 1 + .../main/java/org/jooq/impl/LazyCatalog.java | 10 ++--- .../main/java/org/jooq/impl/LazySchema.java | 10 ++--- .../main/java/org/jooq/impl/LazySupplier.java | 2 +- .../main/java/org/jooq/impl/PackageImpl.java | 12 +++-- .../main/java/org/jooq/impl/SchemaImpl.java | 11 +++-- .../main/java/org/jooq/impl/SequenceImpl.java | 7 +-- .../main/java/org/jooq/impl/TableImpl.java | 13 +++--- .../java/org/jooq/impl/TableRecordImpl.java | 13 ++---- jOOQ/src/main/java/org/jooq/impl/UDTImpl.java | 6 +-- .../java/org/jooq/impl/UDTRecordImpl.java | 4 +- .../org/jooq/impl/UpdatableRecordImpl.java | 4 +- .../org/jooq/util/jaxb/tools/MiniJAXB.java | 45 ++++++++++--------- .../jooq/util/jaxb/tools/XMLAppendable.java | 2 +- .../org/jooq/util/jaxb/tools/XMLBuilder.java | 2 +- 23 files changed, 81 insertions(+), 91 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Internal.java b/jOOQ/src/main/java/org/jooq/Internal.java index 8bb1fe23aa..48be4fd893 100644 --- a/jOOQ/src/main/java/org/jooq/Internal.java +++ b/jOOQ/src/main/java/org/jooq/Internal.java @@ -59,5 +59,6 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.CLASS) @Target(value = { FIELD, METHOD, TYPE, ANNOTATION_TYPE }) @Internal +@org.jetbrains.annotations.ApiStatus.Internal public @interface Internal { } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java index aa414f8316..9676bd646c 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.jooq.Internal +@org.jetbrains.annotations.ApiStatus.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 5e980dc71e..91e588c3f7 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.jooq.Internal +@org.jetbrains.annotations.ApiStatus.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 4a6498a68b..54a702257a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java @@ -394,8 +394,6 @@ 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 f424b7609b..9048071a71 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java @@ -43,22 +43,21 @@ 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.Schema; -// ... import org.jooq.QueryPart; // ... +import org.jooq.Schema; +// ... import org.jooq.tools.StringUtils; +import org.jetbrains.annotations.ApiStatus.Internal; + /** * A common base class for database catalogs *

@@ -66,7 +65,7 @@ import org.jooq.tools.StringUtils; * * @author Lukas Eder */ -@org.jooq.Internal +@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/DefaultCommitProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultCommitProvider.java index 4cb58a47c2..77dbca0665 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultCommitProvider.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultCommitProvider.java @@ -43,6 +43,8 @@ import org.jooq.Configuration; import org.jooq.DSLContext; import org.jooq.migrations.xml.jaxb.MigrationsType; +import org.jetbrains.annotations.ApiStatus.Experimental; + /** * A default implementation of the {@link CommitProvider} SPI, which provides * a materialisation of the currently available database version graph. @@ -51,7 +53,7 @@ import org.jooq.migrations.xml.jaxb.MigrationsType; * * @author Lukas Eder */ -@org.jooq.Internal +@Experimental public class DefaultCommitProvider implements CommitProvider { private final DSLContext ctx; diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index 4a6bcec363..8414665d8c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -117,6 +117,8 @@ import org.jooq.types.UInteger; import org.jooq.types.ULong; import org.jooq.types.UShort; +import org.jetbrains.annotations.ApiStatus.Internal; + /** * A common base class for data types. *

@@ -127,7 +129,7 @@ import org.jooq.types.UShort; * @author Lukas Eder */ @SuppressWarnings({"unchecked"}) -@org.jooq.Internal +@Internal public class DefaultDataType extends AbstractDataTypeX { private static final Set ENCODED_TIMESTAMP_PRECISION = SQLDialect.supportedBy(HSQLDB, MARIADB); diff --git a/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java index 0dc26dfb67..81d58485ba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java @@ -46,6 +46,8 @@ 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 *

@@ -53,7 +55,7 @@ import org.jooq.TableField; * * @author Lukas Eder */ -@org.jooq.Internal +@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 a88b890a49..6a497de1c6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Internal.java +++ b/jOOQ/src/main/java/org/jooq/impl/Internal.java @@ -100,6 +100,7 @@ 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 0ea49589ad..05e610c1e1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java @@ -38,19 +38,17 @@ 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.Schema; -// ... import org.jooq.QueryPart; // ... +import org.jooq.Schema; +// ... + +import org.jetbrains.annotations.ApiStatus.Internal; /** * 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 ef1e3cc2ac..6c74127047 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazySchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazySchema.java @@ -38,8 +38,6 @@ 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; @@ -47,18 +45,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.jooq.QueryPart; -// ... + +import org.jetbrains.annotations.ApiStatus.Internal; /** * 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 5cbe4a597f..70bc35b110 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.jooq.Internal; +import org.jetbrains.annotations.ApiStatus.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 5a158fb754..b555f70462 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java @@ -37,18 +37,16 @@ */ 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.jooq.QueryPart; -// ... + +import org.jetbrains.annotations.ApiStatus.Internal; /** * A default implementation for packages (containers of stored procedures and @@ -60,7 +58,7 @@ import org.jooq.QueryPart; * * @author Lukas Eder */ -@org.jooq.Internal +@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 50bb76f755..e1afe7ff4b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java @@ -49,8 +49,6 @@ 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; @@ -59,19 +57,20 @@ 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 *

@@ -79,7 +78,7 @@ import org.jooq.tools.StringUtils; * * @author Lukas Eder */ -@org.jooq.Internal +@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 d3cb9db28c..f2385262e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java @@ -74,12 +74,9 @@ 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.Nullable; +import org.jetbrains.annotations.ApiStatus.Internal; /** * A common base class for sequences @@ -88,7 +85,7 @@ import org.jetbrains.annotations.Nullable; * * @author Lukas Eder */ -@org.jooq.Internal +@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 57b5e56079..55c537f973 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -62,8 +62,6 @@ 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; @@ -71,7 +69,6 @@ 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; @@ -87,6 +84,8 @@ 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 *

@@ -94,7 +93,7 @@ import org.jooq.tools.StringUtils; * * @author Lukas Eder */ -@org.jooq.Internal +@Internal public class TableImpl extends AbstractTable @@ -258,7 +257,7 @@ implements * This method is used by generated code of table valued functions. Do not * call this method directly. */ - @org.jooq.Internal + @Internal protected boolean aliased() { return getAliasedTable() != null; } @@ -269,13 +268,13 @@ implements * This method is used by generated code of synthetic views. Do not * call this method directly. */ - @org.jooq.Internal + @Internal protected boolean isSynthetic() { return false; } @Override - @org.jooq.Internal + @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 5e30157a25..ddee9c6aac 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java @@ -39,7 +39,6 @@ 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; @@ -50,13 +49,9 @@ 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; @@ -77,9 +72,7 @@ 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; @@ -88,12 +81,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.jooq.tools.StringUtils; + +import org.jetbrains.annotations.ApiStatus.Internal; /** * A record implementation for a record originating from a single table @@ -102,7 +95,7 @@ import org.jooq.tools.StringUtils; * * @author Lukas Eder */ -@org.jooq.Internal +@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 7f3507d2e7..a4cca8402f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java @@ -47,17 +47,15 @@ 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.Nullable; +import org.jetbrains.annotations.ApiStatus.Internal; /** * A common base type for UDT's @@ -66,7 +64,7 @@ import org.jetbrains.annotations.Nullable; * * @author Lukas Eder */ -@org.jooq.Internal +@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 70e118f8f3..53b3e8ae4e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java @@ -40,6 +40,8 @@ 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 *

@@ -47,7 +49,7 @@ import org.jooq.UDTRecord; * * @author Lukas Eder */ -@org.jooq.Internal +@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 84741ac4b7..1e6eab1153 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java @@ -89,6 +89,8 @@ 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 *

@@ -96,7 +98,7 @@ import org.jooq.tools.StringUtils; * * @author Lukas Eder */ -@org.jooq.Internal +@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); diff --git a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java index b6be1d5df4..00bbdcc43d 100644 --- a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java +++ b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java @@ -64,6 +64,29 @@ import java.util.List; import java.util.Map; import javax.xml.XMLConstants; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; + +import org.jooq.Constants; +import org.jooq.exception.ConfigurationException; +import org.jooq.tools.Convert; +import org.jooq.tools.JooqLogger; +import org.jooq.tools.reflect.Reflect; +import org.jooq.tools.reflect.ReflectException; + +import org.jetbrains.annotations.ApiStatus.Internal; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.ErrorHandler; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElementWrapper; import jakarta.xml.bind.annotation.XmlEnum; @@ -73,28 +96,6 @@ import jakarta.xml.bind.annotation.XmlSchema; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; - -import org.jooq.Constants; -import org.jooq.Internal; -import org.jooq.exception.ConfigurationException; -import org.jooq.tools.Convert; -import org.jooq.tools.JooqLogger; -import org.jooq.tools.reflect.Reflect; -import org.jooq.tools.reflect.ReflectException; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.ErrorHandler; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; /** * This class allows for mashalling / unmarshalling XML content to jOOQ diff --git a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLAppendable.java b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLAppendable.java index e584c7d9ba..8e18371644 100644 --- a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLAppendable.java +++ b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLAppendable.java @@ -37,7 +37,7 @@ */ package org.jooq.util.jaxb.tools; -import org.jooq.Internal; +import org.jetbrains.annotations.ApiStatus.Internal; /** * Interface to be implemented by JAXB annotated Java classes which are diff --git a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java index 252b41cd1a..53d2923048 100644 --- a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java +++ b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java @@ -41,7 +41,7 @@ import java.io.IOException; import java.util.List; import java.util.regex.Pattern; -import org.jooq.Internal; +import org.jetbrains.annotations.ApiStatus.Internal; /** * Wrapper around a {@link StringBuilder} which can be used to serialize