From 4a166cbcd9053f01d64443127bc4258dddf1278f Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 11 Jul 2019 12:08:32 +0200 Subject: [PATCH] [jOOQ/jOOQ#2026] Annotated additional types as Internal --- jOOQ/src/main/java/org/jooq/BindContext.java | 1 + jOOQ/src/main/java/org/jooq/DSLContext.java | 2 ++ jOOQ/src/main/java/org/jooq/Internal.java | 14 +++++++++----- jOOQ/src/main/java/org/jooq/QueryPartInternal.java | 1 + jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java | 1 + .../main/java/org/jooq/impl/AbstractRoutine.java | 1 + .../main/java/org/jooq/impl/ArrayRecordImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java | 1 + .../main/java/org/jooq/impl/DefaultDataType.java | 1 + .../java/org/jooq/impl/EmbeddableRecordImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/Internal.java | 1 + jOOQ/src/main/java/org/jooq/impl/PackageImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/TableImpl.java | 1 + .../main/java/org/jooq/impl/TableRecordImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/UDTImpl.java | 1 + .../src/main/java/org/jooq/impl/UDTRecordImpl.java | 1 + .../java/org/jooq/impl/UpdatableRecordImpl.java | 1 + .../java/org/jooq/util/jaxb/tools/MiniJAXB.java | 2 +- .../java/org/jooq/util/jaxb/tools/XMLBuilder.java | 2 +- 21 files changed, 30 insertions(+), 7 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/BindContext.java b/jOOQ/src/main/java/org/jooq/BindContext.java index 357a152824..dd83534416 100644 --- a/jOOQ/src/main/java/org/jooq/BindContext.java +++ b/jOOQ/src/main/java/org/jooq/BindContext.java @@ -53,6 +53,7 @@ import org.jooq.exception.DataAccessException; * @author Lukas Eder * @see RenderContext */ +@Internal public interface BindContext extends Context { /** diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index f76c0fbdcb..ea75d5d61a 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -596,6 +596,7 @@ public interface DSLContext extends Scope , AutoCloseable { * completely internal with jOOQ 4.0 */ @Deprecated + @Internal RenderContext renderContext(); /** @@ -699,6 +700,7 @@ public interface DSLContext extends Scope , AutoCloseable { * completely internal with jOOQ 4.0 */ @Deprecated + @Internal BindContext bindContext(PreparedStatement stmt); /** diff --git a/jOOQ/src/main/java/org/jooq/Internal.java b/jOOQ/src/main/java/org/jooq/Internal.java index 942d24192d..579b886ad3 100644 --- a/jOOQ/src/main/java/org/jooq/Internal.java +++ b/jOOQ/src/main/java/org/jooq/Internal.java @@ -37,6 +37,7 @@ */ package org.jooq; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; @@ -47,13 +48,16 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Signifies that a API (public class, method or field) is internal and subject to incompatible - * changes, or even removal, in a future release. An API bearing this annotation is exempt from any - * compatibility guarantees made by its containing library. + * Signifies that a API (public class, method or field) is internal and subject + * to incompatible changes, or even removal, in a future release. An API bearing + * this annotation is exempt from any compatibility guarantees made by its + * containing library. * * @author Knut Wannheden */ @Documented @Retention(RetentionPolicy.CLASS) -@Target(value={FIELD, METHOD, TYPE}) -public @interface Internal {} +@Target(value = { FIELD, METHOD, TYPE, ANNOTATION_TYPE }) +@Internal +public @interface Internal { +} diff --git a/jOOQ/src/main/java/org/jooq/QueryPartInternal.java b/jOOQ/src/main/java/org/jooq/QueryPartInternal.java index 34ae4ddd54..8ff5facf2a 100644 --- a/jOOQ/src/main/java/org/jooq/QueryPartInternal.java +++ b/jOOQ/src/main/java/org/jooq/QueryPartInternal.java @@ -47,6 +47,7 @@ import org.jooq.exception.DataAccessException; * * @author Lukas Eder */ +@Internal public interface QueryPartInternal extends QueryPart { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java index 8a99eed9b4..4780df8cf4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java @@ -55,6 +55,7 @@ import org.jooq.UniqueKey; * @deprecated - [#6875] [#7158] - 3.11.0 - Please re-generate your code */ @Deprecated +@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 2e1bec6932..d0811ba78e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -146,6 +146,7 @@ import org.jooq.tools.reflect.Reflect; * * @author Lukas Eder */ +@org.jooq.Internal public abstract class AbstractRoutine extends AbstractNamed implements Routine { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java index 7c07cb9219..13904b7164 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayRecordImpl.java @@ -483,6 +483,7 @@ package org.jooq.impl; + \ No newline at end of file diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java index fd50e5dfdd..2c0ab90805 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java @@ -58,6 +58,7 @@ import org.jooq.Schema; * * @author Lukas Eder */ +@org.jooq.Internal public class CatalogImpl extends AbstractNamed implements Catalog { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index cd3a94d70e..7b9955a7e2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -99,6 +99,7 @@ import org.jooq.types.UShort; * @author Lukas Eder */ @SuppressWarnings({"unchecked"}) +@org.jooq.Internal public class DefaultDataType implements DataType { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java index 441e610d1f..ed28494389 100644 --- a/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/EmbeddableRecordImpl.java @@ -49,6 +49,7 @@ import org.jooq.Row; * * @author Lukas Eder */ +@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 b10b718683..03561c24f2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Internal.java +++ b/jOOQ/src/main/java/org/jooq/impl/Internal.java @@ -59,6 +59,7 @@ import org.jooq.UniqueKey; * * @author Lukas Eder */ +@org.jooq.Internal public final class Internal { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java index 5231eda618..73592a0ef0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java @@ -53,6 +53,7 @@ import org.jooq.Schema; * * @author Lukas Eder */ +@org.jooq.Internal public class PackageImpl extends AbstractNamed implements Package { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java index 4199f089bd..0ef49969b8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java @@ -62,6 +62,7 @@ import org.jooq.UDT; * * @author Lukas Eder */ +@org.jooq.Internal public class SchemaImpl extends AbstractNamed implements Schema { private static final long serialVersionUID = -8101463810207566546L; diff --git a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java index 6989aa4b87..0c016d60bd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java @@ -70,6 +70,7 @@ import org.jooq.exception.SQLDialectNotSupportedException; * * @author Lukas Eder */ +@org.jooq.Internal public class SequenceImpl extends AbstractNamed implements Sequence { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java index 8448e03a10..f82e657cea 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -71,6 +71,7 @@ import org.jooq.tools.StringUtils; * * @author Lukas Eder */ +@org.jooq.Internal public class TableImpl extends AbstractTable { private static final long serialVersionUID = 261033315221985068L; diff --git a/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java index 4f923e9f5f..081b7d7337 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java @@ -87,6 +87,7 @@ import org.jooq.tools.JooqLogger; * * @author Lukas Eder */ +@org.jooq.Internal public class TableRecordImpl> extends AbstractRecord implements TableRecord { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java index f3f92f9abd..7591e90bff 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java @@ -62,6 +62,7 @@ import org.jooq.UDTRecord; * * @author Lukas Eder */ +@org.jooq.Internal public class UDTImpl> extends AbstractNamed implements UDT { private static final long serialVersionUID = -2208672099190913126L; diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java index ce439928e8..9303a42795 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTRecordImpl.java @@ -59,6 +59,7 @@ import org.jooq.UDTRecord; * * @author Lukas Eder */ +@org.jooq.Internal public class UDTRecordImpl> extends AbstractRecord implements UDTRecord { /** diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java index 00d60d4a27..6570d13ebb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java @@ -81,6 +81,7 @@ import org.jooq.tools.StringUtils; * * @author Lukas Eder */ +@org.jooq.Internal public class UpdatableRecordImpl> extends TableRecordImpl implements UpdatableRecord { /** 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 1f40c03652..0450d3671a 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 @@ -88,7 +88,7 @@ import org.xml.sax.InputSource; * @author Lukas Eder */ @Internal -public class MiniJAXB { +public final class MiniJAXB { public static String marshal(XMLAppendable object) { StringWriter writer = new StringWriter(); 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 b10e6d2b7f..e5deb6b65a 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 @@ -55,7 +55,7 @@ import org.jooq.Internal; * @author Knut Wannheden */ @Internal -public class XMLBuilder { +public final class XMLBuilder { private final StringBuilder builder = new StringBuilder();