This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new e992f7320 Update deprecation annotations
e992f7320 is described below
commit e992f73201efe8bb6aaa80967166d215d0d4222b
Author: stariy95 <[email protected]>
AuthorDate: Mon Nov 27 16:25:20 2023 +0400
Update deprecation annotations
---
.../src/main/java/org/apache/cayenne/tools/DbImporterTask.java | 4 ++--
.../cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java | 4 ++--
.../apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java | 4 ++--
.../main/java/org/apache/cayenne/access/IncrementalFaultList.java | 2 +-
.../access/translator/batch/legacy/DefaultBatchTranslator.java | 2 +-
.../src/main/java/org/apache/cayenne/configuration/Constants.java | 1 +
.../apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java | 2 +-
.../org/apache/cayenne/configuration/runtime/ServerRuntime.java | 6 +++---
cayenne/src/main/java/org/apache/cayenne/map/ObjRelationship.java | 5 ++---
9 files changed, 15 insertions(+), 15 deletions(-)
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 dc661ba40..d4b35ace1 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 @@ public class DbImporterTask extends Task {
}
/**
- * @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 2aef9b49c..f1b78f542 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 @@ public class DbImportConfiguration {
* @deprecated since 5.0
* @return false
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public boolean isUsePrimitives() {
return false;
}
@@ -153,7 +153,7 @@ public class DbImportConfiguration {
* @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 0a80e5cfd..38c61c70c 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 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
* @return false
* @deprecated since 5.0
*/
- @Deprecated
+ @Deprecated(since = "5.0", forRemoval = true)
public boolean isUsePrimitives() {
return false;
}
@@ -284,7 +284,7 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
* 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 e07dd4372..00f73d5d4 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 @@ public class IncrementalFaultList<E> implements List<E>,
Serializable {
* @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 381db10b1..f5a07939d 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 @@ import org.apache.cayenne.query.BatchQueryRow;
* @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 67958de6e..ea28b6509 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 @@ public interface Constants {
/**
* @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 3ce6c9d24..04bd36437 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 @@ import org.slf4j.LoggerFactory;
* @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 f6b3eef4b..fd944727c 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 @@ import java.util.Collections;
* @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 @@ public class ServerRuntime extends CayenneRuntime {
* @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 @@ public class ServerRuntime extends CayenneRuntime {
* @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 82f0abfb4..419faa9e3 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 @@ public class ObjRelationship extends
Relationship<ObjEntity, ObjAttribute, ObjRe
}
/**
- * 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) {
