Update deprecation annotations
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index dc661ba..d4b35ac 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -243,9 +243,9 @@
}
/**
- * @deprecated since 5.0
+ * @deprecated since 5.0 this method is unused and does nothing
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public void setUsePrimitives(boolean flag) {
}
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
index 2aef9b4..f1b78f5 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
@@ -143,7 +143,7 @@
* @deprecated since 5.0
* @return false
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public boolean isUsePrimitives() {
return false;
}
@@ -153,7 +153,7 @@
* @param usePrimitives not used
* @deprecated since 5.0
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public void setUsePrimitives(boolean usePrimitives) {
}
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
index 0a80e5c..38c61c7 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
@@ -247,7 +247,7 @@
* @return false
* @deprecated since 5.0
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public boolean isUsePrimitives() {
return false;
}
@@ -284,7 +284,7 @@
* does nothing
* @deprecated since 5.0
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public void setUsePrimitives(boolean usePrimitives) {
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java b/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
index e07dd43..00f73d5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
@@ -142,7 +142,7 @@
* @since 3.0
* @deprecated since 5.0, does nothing
*/
- @Deprecated(forRemoval = true)
+ @Deprecated(since = "5.0", forRemoval = true)
protected void fillIn(final Query query, List<Object> elementsList) {
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/legacy/DefaultBatchTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/legacy/DefaultBatchTranslator.java
index 381db10..f5a0793 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/legacy/DefaultBatchTranslator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/legacy/DefaultBatchTranslator.java
@@ -34,7 +34,7 @@
* @since 4.0
* @deprecated since 4.2
*/
-@Deprecated
+@Deprecated(since = "4.2")
public abstract class DefaultBatchTranslator implements BatchTranslator {
protected BatchQuery query;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
index 67958de..ea28b65 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
@@ -228,6 +228,7 @@
/**
* @deprecated since 5.0, use {@link #MAX_ID_QUALIFIER_SIZE_PROPERTY}
*/
+ @Deprecated(since = "5.0", forRemoval = true)
String SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY = MAX_ID_QUALIFIER_SIZE_PROPERTY;
/**
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java
index 3ce6c9d..04bd364 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java
@@ -34,7 +34,7 @@
* @since 3.1
* @deprecated since 5.0, unused by Cayenne
*/
-@Deprecated
+@Deprecated(since = "5.0")
public class JNDIDataSourceFactory implements DataSourceFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(JNDIDataSourceFactory.class);
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/ServerRuntime.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/ServerRuntime.java
index f6b3eef..fd94472 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/ServerRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/ServerRuntime.java
@@ -34,7 +34,7 @@
* @since 3.1
* @deprecated since 5.0, use {@link CayenneRuntime} class instead
*/
-@Deprecated(forRemoval = true)
+@Deprecated(since = "5.0", forRemoval = true)
public class ServerRuntime extends CayenneRuntime {
private static final Logger LOGGER = LoggerFactory.getLogger(ServerRuntime.class);
@@ -46,7 +46,7 @@
* @since 4.0
* @deprecated since 5.0, use {@link CayenneRuntime#builder()} instead
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public static CayenneRuntimeBuilder builder() {
LOGGER.warn("ServerRuntime is deprecated, use CayenneRuntime instead");
return CayenneRuntime.builder();
@@ -59,7 +59,7 @@
* @return a named builder of CayenneRuntime.
* @deprecated since 5.0, use {@link CayenneRuntime#builder(String)} instead
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public static CayenneRuntimeBuilder builder(String name) {
LOGGER.warn("ServerRuntime is deprecated, use CayenneRuntime instead");
return CayenneRuntime.builder(name);
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/ObjRelationship.java b/cayenne/src/main/java/org/apache/cayenne/map/ObjRelationship.java
index 82f0abf..419faa9 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/ObjRelationship.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/ObjRelationship.java
@@ -662,11 +662,10 @@
}
/**
- * Recalculates a new readonly value based on the underlying
- * DbRelationships.
+ * Recalculates a new readonly value based on the underlying DbRelationships.
* @deprecated since 4.2
*/
- @Deprecated
+ @Deprecated(since = "4.2")
public void recalculateReadOnlyValue() {
// not flattened, always read/write
if (dbRelationships.size() < 2) {
