Skip to content

escalate some annotation deprecations to forRemoval=true #9555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2025
Merged

escalate some annotation deprecations to forRemoval=true #9555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*
* @deprecated use {@link #strategy()}
*/
@Deprecated(since = "6.0")
@Deprecated(since = "6.0", forRemoval = true)
String value() default "";
/**
* A class implementing {@link PropertyAccessStrategy}.
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* @deprecated Use the JPA-defined
* {@link jakarta.persistence.CascadeType}
*/
@Deprecated(since = "7")
@Deprecated(since = "7", forRemoval = true)
@Target({METHOD, FIELD})
@Retention(RUNTIME)
public @interface Cascade {
Expand Down
6 changes: 4 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
* @see Cascade
*
* @deprecated Use the JPA-defined
* {@link jakarta.persistence.CascadeType}
* {@link jakarta.persistence.CascadeType}.
* This enumeration will be removed to alleviate the
* duplication in naming.
*/
@Deprecated(since = "7")
@Deprecated(since = "7", forRemoval = true)
public enum CascadeType {
/**
* Includes all types listed here.
Expand Down
3 changes: 3 additions & 0 deletions hibernate-core/src/main/java/org/hibernate/annotations/Checks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@
/**
* A list of {@link Check}s.
*
* @deprecated since {@link Check} is deprecated.
*
* @author Gavin King
*/
@Target({TYPE, METHOD, FIELD})
@Retention(RUNTIME)
@Deprecated(since = "7")
public @interface Checks {
Check[] value();
}
5 changes: 3 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
* @see NamedQuery#flushMode
* @see NamedNativeQuery#flushMode
*
* @deprecated use {@link QueryFlushMode}
* @deprecated Use {@link QueryFlushMode}. This enumeration will be removed to alleviate
* the duplication in naming with {@link jakarta.persistence.FlushModeType}.
*/
@Deprecated(since="7")
@Deprecated(since="7", forRemoval = true)
public enum FlushModeType {
/**
* Corresponds to {@link org.hibernate.FlushMode#ALWAYS}.
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
@Target({PACKAGE, TYPE, METHOD, FIELD})
@Retention(RUNTIME)
@Repeatable(GenericGenerators.class)
@Deprecated(since = "6.5")
@Deprecated(since = "6.5", forRemoval = true)
public @interface GenericGenerator {
/**
* The name of the identifier generator. This is the name that may be specified by
Expand All @@ -93,7 +93,7 @@
*
* @deprecated use {@link #type()} for typesafety
*/
@Deprecated(since="6.2")
@Deprecated(since="6.2", forRemoval = true)
String strategy() default "native";
/**
* Parameters to be passed to {@link org.hibernate.id.IdentifierGenerator#configure}
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
@Target({PACKAGE, TYPE})
@Retention(RUNTIME)
@Deprecated(since = "6.5")
@Deprecated(since = "6.5", forRemoval = true)
public @interface GenericGenerators {
/**
* The aggregated generators.
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
*
* @deprecated use {@link #flush()}
*/
@Deprecated(since = "7")
@Deprecated(since = "7", forRemoval = true)
FlushModeType flushMode() default FlushModeType.PERSISTENCE_CONTEXT;

/**
Expand Down Expand Up @@ -182,6 +182,6 @@
*
* @see org.hibernate.jpa.HibernateHints#HINT_CALLABLE_FUNCTION
*/
@Deprecated( since = "6.0" )
@Deprecated(since = "6.0", forRemoval = true)
boolean callable() default false;
}
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
*
* @deprecated use {@link #flush()}
*/
@Deprecated(since = "7")
@Deprecated(since = "7", forRemoval = true)
FlushModeType flushMode() default FlushModeType.PERSISTENCE_CONTEXT;

/**
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*
* @deprecated Use an {@link Expectation} class instead.
*/
@Deprecated(since = "6.5")
@Deprecated(since = "6.5", forRemoval = true)
public enum ResultCheckStyle {
/**
* No return code checking. Might mean that no checks are required, or that
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
*
* @deprecated use {@link #verify()} with an {@link Expectation} class
*/
@Deprecated(since = "6.5")
@Deprecated(since = "6.5", forRemoval = true)
ResultCheckStyle check() default ResultCheckStyle.NONE;

/**
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
*
* @deprecated use {@link #verify()} with an {@link Expectation} class
*/
@Deprecated(since = "6.5")
@Deprecated(since = "6.5", forRemoval = true)
ResultCheckStyle check() default ResultCheckStyle.NONE;

/**
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
*
* @deprecated use {@link #verify()} with an {@link Expectation} class
*/
@Deprecated(since = "6.5")
@Deprecated(since = "6.5", forRemoval = true)
ResultCheckStyle check() default ResultCheckStyle.NONE;

/**
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
*
* @deprecated use {@link #verify()} with an {@link Expectation} class
*/
@Deprecated(since = "6.5")
@Deprecated(since = "6.5", forRemoval = true)
ResultCheckStyle check() default ResultCheckStyle.NONE;

/**
Expand Down
Loading