You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/06/08 00:19:39 UTC
(cayenne) 04/07: Unifying @Deprecated annotations style
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch past-M2
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 6e8ed2e0fde5589e9bfade70aabc3f40b50ad950
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sun Jun 7 12:21:38 2026 -0400
Unifying @Deprecated annotations style
---
.../org/apache/cayenne/tools/DbImporterTask.java | 2 +-
.../invalidation/CacheInvalidationModule.java | 2 +-
.../reverse/dbimport/DbImportConfiguration.java | 2 --
.../reverse/dbimport/ReverseEngineering.java | 2 --
.../org/apache/cayenne/jcache/JCacheModule.java | 2 +-
.../apache/cayenne/jcache/JCacheQueryCache.java | 4 ++--
.../org/apache/cayenne/project/ProjectModule.java | 4 ++--
.../main/java/org/apache/cayenne/BaseContext.java | 2 +-
.../java/org/apache/cayenne/BaseDataObject.java | 2 +-
.../main/java/org/apache/cayenne/DataObject.java | 2 +-
.../java/org/apache/cayenne/ObjectContext.java | 4 ++--
.../org/apache/cayenne/access/DataContext.java | 2 +-
.../cayenne/access/IncrementalFaultList.java | 2 +-
.../org/apache/cayenne/cache/MapQueryCache.java | 10 +++++----
.../org/apache/cayenne/cache/NestedQueryCache.java | 1 -
.../java/org/apache/cayenne/cache/QueryCache.java | 4 ++--
.../org/apache/cayenne/commitlog/CommitLog.java | 2 +-
.../apache/cayenne/configuration/Constants.java | 24 ++++++++++----------
.../cayenne/configuration/runtime/CoreModule.java | 26 +++++++++++-----------
.../configuration/server/ServerRuntime.java | 6 ++---
.../cayenne/configuration/server/package-info.java | 2 +-
.../java/org/apache/cayenne/dba/DbAdapter.java | 4 ++--
.../java/org/apache/cayenne/dba/JdbcAdapter.java | 4 ++--
.../org/apache/cayenne/exp/TraversalHelper.java | 2 +-
.../cayenne/exp/property/CollectionProperty.java | 20 ++++++++---------
.../cayenne/exp/property/EntityProperty.java | 8 +++----
.../apache/cayenne/exp/property/MapProperty.java | 16 ++++++-------
.../org/apache/cayenne/map/ObjRelationship.java | 1 -
.../org/apache/cayenne/query/RefreshQuery.java | 2 +-
.../java/org/apache/cayenne/query/SelectById.java | 26 +++++++++++-----------
.../apache/cayenne/reflect/ClassDescriptor.java | 2 +-
.../main/java/org/apache/cayenne/util/Util.java | 2 +-
.../org/apache/cayenne/cache/MockQueryCache.java | 6 +++--
33 files changed, 99 insertions(+), 101 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 d4b35ace1..28a6cf24f 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,7 +243,7 @@ public class DbImporterTask extends Task {
}
/**
- * @deprecated since 5.0 this method is unused and does nothing
+ * @deprecated this method is unused and does nothing
*/
@Deprecated(since = "5.0", forRemoval = true)
public void setUsePrimitives(boolean flag) {
diff --git a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
index 76e06eec1..90d97e8dd 100644
--- a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
+++ b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
@@ -34,7 +34,7 @@ public class CacheInvalidationModule implements Module {
/**
* @deprecated in favor of {@link #extend(Binder)}
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
static ListBuilder<InvalidationHandler> contributeInvalidationHandler(Binder binder) {
return binder.bindList(InvalidationHandler.class);
}
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 f1b78f542..0827d8441 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
@@ -140,7 +140,6 @@ public class DbImportConfiguration {
}
/**
- * @deprecated since 5.0
* @return false
*/
@Deprecated(since = "5.0", forRemoval = true)
@@ -151,7 +150,6 @@ public class DbImportConfiguration {
/**
* does nothing
* @param usePrimitives not used
- * @deprecated since 5.0
*/
@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 38c61c70c..d1baba64c 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
@@ -245,7 +245,6 @@ public class ReverseEngineering extends SchemaContainer implements Serializable,
/**
* @return false
- * @deprecated since 5.0
*/
@Deprecated(since = "5.0", forRemoval = true)
public boolean isUsePrimitives() {
@@ -282,7 +281,6 @@ public class ReverseEngineering extends SchemaContainer implements Serializable,
/**
* does nothing
- * @deprecated since 5.0
*/
@Deprecated(since = "5.0", forRemoval = true)
public void setUsePrimitives(boolean usePrimitives) {
diff --git a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModule.java b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModule.java
index a3a7de1c2..fa20e690e 100644
--- a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModule.java
+++ b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModule.java
@@ -41,7 +41,7 @@ public class JCacheModule implements Module {
/**
* @deprecated in favor of {@link #extend(Binder)}
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static void contributeJCacheProviderConfig(Binder binder, String providerConfigURI) {
extend(binder).setJCacheProviderConfig(providerConfigURI);
}
diff --git a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java
index 2973153f0..6e4d16f5b 100644
--- a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java
+++ b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java
@@ -104,10 +104,10 @@ public class JCacheQueryCache implements QueryCache {
}
/**
- * @deprecated since 4.0 . Note that this method should not be relied upon to clear caches consistently. It only
+ * @deprecated Note that this method should not be relied upon to clear caches consistently. It only
* operates on a subset of caches that were created by this object, and ignores any preconfigured caches.
*/
- @Deprecated
+ @Deprecated(since = "4.0")
@Override
public void clear() {
for (String name : seenCacheNames) {
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModule.java b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModule.java
index 9e1ee3687..97a5afb8e 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModule.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModule.java
@@ -55,7 +55,7 @@ public class ProjectModule implements Module {
* @since 4.1
* @deprecated in favor of {@link #extend(Binder)}
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<ProjectExtension> contributeExtensions(Binder binder) {
return binder.bindList(ProjectExtension.class);
}
@@ -64,7 +64,7 @@ public class ProjectModule implements Module {
* @since 4.1
* @deprecated in favor of {@link #extend(Binder)}
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<UpgradeHandler> contributeUpgradeHandler(Binder binder) {
return binder.bindList(UpgradeHandler.class);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/BaseContext.java b/cayenne/src/main/java/org/apache/cayenne/BaseContext.java
index d308b4fef..98da908ea 100644
--- a/cayenne/src/main/java/org/apache/cayenne/BaseContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/BaseContext.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.access.DataContext;
* A common base superclass for Cayenne ObjectContext implementors.
*
* @since 3.0
- * @deprecated since 5.0, use {@link DataContext} directly
+ * @deprecated use {@link DataContext} directly
*/
@Deprecated(since = "5.0", forRemoval = true)
public abstract class BaseContext extends DataContext {
diff --git a/cayenne/src/main/java/org/apache/cayenne/BaseDataObject.java b/cayenne/src/main/java/org/apache/cayenne/BaseDataObject.java
index 41721d52b..8819f01f9 100644
--- a/cayenne/src/main/java/org/apache/cayenne/BaseDataObject.java
+++ b/cayenne/src/main/java/org/apache/cayenne/BaseDataObject.java
@@ -27,7 +27,7 @@ package org.apache.cayenne;
* @see HybridPersistentObject
*
* @since 4.1
- * @deprecated since 5.0, use {@link PersistentObject} directly
+ * @deprecated use {@link PersistentObject} directly
*/
@Deprecated(since = "5.0", forRemoval = true)
public abstract class BaseDataObject extends PersistentObject implements Persistent, Validating {
diff --git a/cayenne/src/main/java/org/apache/cayenne/DataObject.java b/cayenne/src/main/java/org/apache/cayenne/DataObject.java
index ee76f90fe..a875d19a7 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataObject.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataObject.java
@@ -22,7 +22,7 @@ package org.apache.cayenne;
/**
* Defines basic methods for a persistent object in Cayenne.
*
- * @deprecated since 5.0, use {@link Persistent} interface directly
+ * @deprecated use {@link Persistent} interface directly
*/
@Deprecated(since = "5.0", forRemoval = true)
public interface DataObject extends Persistent {
diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java b/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java
index c5aa5a672..866f82161 100644
--- a/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/ObjectContext.java
@@ -262,9 +262,9 @@ public interface ObjectContext extends DataChannel, Serializable {
/**
* Returns a DataChannel used by this context.
*
- * @deprecated since 5.0 in favor of {@link DataChannel#getParent()}
+ * @deprecated in favor of {@link DataChannel#getParent()}
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
default DataChannel getChannel() {
return getParent();
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
index 9d110dd5d..4838db566 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
@@ -1264,7 +1264,7 @@ public class DataContext implements ObjectContext {
/**
* @since 4.0
- * @deprecated since 4.0 avoid using this directly. Transaction management
+ * @deprecated avoid using this directly. Transaction management
* at this level will be eventually removed
*/
@Deprecated
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 e0749d7cc..096b9bfbb 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
@@ -140,7 +140,7 @@ public class IncrementalFaultList<E> implements List<E>, Serializable {
* fully resolved. For the rest of the list, only ObjectIds are read.
*
* @since 3.0
- * @deprecated since 5.0, does nothing
+ * @deprecated does nothing
*/
@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/cache/MapQueryCache.java b/cayenne/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
index 851c6c05f..a189e6817 100644
--- a/cayenne/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
+++ b/cayenne/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.cache;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.query.QueryMetadata;
+import org.apache.cayenne.util.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
+
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.query.QueryMetadata;
-import org.apache.cayenne.util.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
-
/**
* A default implementation of the {@link QueryCache} interface that stores data in a
* non-expiring LRUMap.
@@ -119,6 +119,8 @@ public class MapQueryCache implements QueryCache, Serializable {
removeGroup(groupKey);
}
+ @Override
+ @Deprecated(since = "4.0")
public void clear() {
cacheGroups.clear();
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java b/cayenne/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
index 4f5f7f229..b2b51af9c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
+++ b/cayenne/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
@@ -66,7 +66,6 @@ public class NestedQueryCache implements QueryCache {
/**
* Clears the underlying shared cache.
* @see QueryCache#clear()
- * @deprecated since 4.0
*/
@Override
@Deprecated
diff --git a/cayenne/src/main/java/org/apache/cayenne/cache/QueryCache.java b/cayenne/src/main/java/org/apache/cayenne/cache/QueryCache.java
index 0d4199b1d..a7b51fc99 100644
--- a/cayenne/src/main/java/org/apache/cayenne/cache/QueryCache.java
+++ b/cayenne/src/main/java/org/apache/cayenne/cache/QueryCache.java
@@ -78,8 +78,8 @@ public interface QueryCache {
/**
* Clears all cache entries.
*
- * @deprecated since 4.0. Please use implementation specific methods to perform cache management tasks.
+ * @deprecated use implementation specific methods to perform cache management tasks.
*/
- @Deprecated
+ @Deprecated(since = "4.0")
void clear();
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/commitlog/CommitLog.java b/cayenne/src/main/java/org/apache/cayenne/commitlog/CommitLog.java
index 79fb7c234..cdf56e502 100644
--- a/cayenne/src/main/java/org/apache/cayenne/commitlog/CommitLog.java
+++ b/cayenne/src/main/java/org/apache/cayenne/commitlog/CommitLog.java
@@ -32,7 +32,7 @@ import java.lang.annotation.Target;
* @since 4.0
* @deprecated use {@link org.apache.cayenne.annotation.CommitLog} instead.
*/
-@Deprecated(since = "5.0")
+@Deprecated(since = "5.0", forRemoval = true)
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
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 bba4e4ee0..cc69ebef6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
@@ -45,7 +45,7 @@ public interface Constants {
String ADAPTER_DETECTORS_LIST = "cayenne.adapter_detectors";
/**
- * @deprecated since 5.0, use {@link #ADAPTER_DETECTORS_LIST}
+ * @deprecated use {@link #ADAPTER_DETECTORS_LIST}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_ADAPTER_DETECTORS_LIST = ADAPTER_DETECTORS_LIST;
@@ -58,7 +58,7 @@ public interface Constants {
String DOMAIN_LISTENERS_LIST = "cayenne.domain_listeners";
/**
- * @deprecated since 5.0, use {@link #DOMAIN_LISTENERS_LIST}
+ * @deprecated use {@link #DOMAIN_LISTENERS_LIST}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_DOMAIN_LISTENERS_LIST = DOMAIN_LISTENERS_LIST;
@@ -70,7 +70,7 @@ public interface Constants {
String PROJECT_LOCATIONS_LIST = "cayenne.project_locations";
/**
- * @deprecated since 5.0, use {@link #PROJECT_LOCATIONS_LIST}
+ * @deprecated use {@link #PROJECT_LOCATIONS_LIST}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_PROJECT_LOCATIONS_LIST = PROJECT_LOCATIONS_LIST;
@@ -84,7 +84,7 @@ public interface Constants {
String DEFAULT_TYPES_LIST = "cayenne.default_types";
/**
- * @deprecated since 5.0, use {@link #DEFAULT_TYPES_LIST}
+ * @deprecated use {@link #DEFAULT_TYPES_LIST}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_DEFAULT_TYPES_LIST = DEFAULT_TYPES_LIST;
@@ -98,7 +98,7 @@ public interface Constants {
String USER_TYPES_LIST = "cayenne.user_types";
/**
- * @deprecated since 5.0, use {@link #USER_TYPES_LIST}
+ * @deprecated use {@link #USER_TYPES_LIST}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_USER_TYPES_LIST = USER_TYPES_LIST;
@@ -112,7 +112,7 @@ public interface Constants {
String TYPE_FACTORIES_LIST = "cayenne.type_factories";
/**
- * @deprecated since 5.0, use {@link #TYPE_FACTORIES_LIST}
+ * @deprecated use {@link #TYPE_FACTORIES_LIST}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_TYPE_FACTORIES_LIST = TYPE_FACTORIES_LIST;
@@ -123,7 +123,7 @@ public interface Constants {
String RESOURCE_LOCATOR = "cayenne.resource_locator";
/**
- * @deprecated since 5.0, use {@link #RESOURCE_LOCATOR}
+ * @deprecated use {@link #RESOURCE_LOCATOR}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_RESOURCE_LOCATOR = RESOURCE_LOCATOR;
@@ -175,7 +175,7 @@ public interface Constants {
String DOMAIN_NAME_PROPERTY = "cayenne.domain.name";
/**
- * @deprecated since 5.0, use {@link #DOMAIN_NAME_PROPERTY}
+ * @deprecated use {@link #DOMAIN_NAME_PROPERTY}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_DOMAIN_NAME_PROPERTY = DOMAIN_NAME_PROPERTY;
@@ -187,7 +187,7 @@ public interface Constants {
String CONTEXTS_SYNC_PROPERTY = "cayenne.contexts_sync_strategy";
/**
- * @deprecated since 5.0, use {@link #CONTEXTS_SYNC_PROPERTY}
+ * @deprecated use {@link #CONTEXTS_SYNC_PROPERTY}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_CONTEXTS_SYNC_PROPERTY = CONTEXTS_SYNC_PROPERTY;
@@ -199,7 +199,7 @@ public interface Constants {
String OBJECT_RETAIN_STRATEGY_PROPERTY = "cayenne.object_retain_strategy";
/**
- * @deprecated since 5.0, use {@link #CONTEXTS_SYNC_PROPERTY}
+ * @deprecated use {@link #CONTEXTS_SYNC_PROPERTY}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY = OBJECT_RETAIN_STRATEGY_PROPERTY;
@@ -211,7 +211,7 @@ public interface Constants {
String EXTERNAL_TX_PROPERTY = "cayenne.external_tx";
/**
- * @deprecated since 5.0, use {@link #EXTERNAL_TX_PROPERTY}
+ * @deprecated use {@link #EXTERNAL_TX_PROPERTY}
*/
@Deprecated(since = "5.0", forRemoval = true)
String SERVER_EXTERNAL_TX_PROPERTY = EXTERNAL_TX_PROPERTY;
@@ -226,7 +226,7 @@ public interface Constants {
String MAX_ID_QUALIFIER_SIZE_PROPERTY = "cayenne.max_id_qualifier_size";
/**
- * @deprecated since 5.0, use {@link #MAX_ID_QUALIFIER_SIZE_PROPERTY}
+ * @deprecated 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/CoreModule.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
index 49427e36d..545082ff3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
@@ -166,7 +166,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static void useExternalTransactions(Binder binder, boolean useExternal) {
extend(binder).setProperty(Constants.EXTERNAL_TX_PROPERTY, String.valueOf(useExternal));
}
@@ -179,7 +179,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static void setSnapshotCacheSize(Binder binder, int size) {
extend(binder).snapshotCacheSize(size);
}
@@ -192,7 +192,7 @@ public class CoreModule implements Module {
* @return ListBuilder for String locations.
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<String> contributeProjectLocations(Binder binder) {
return binder.bindList(String.class, Constants.PROJECT_LOCATIONS_LIST);
}
@@ -206,7 +206,7 @@ public class CoreModule implements Module {
* @since 4.1
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<DataChannelQueryFilter> contributeDomainQueryFilters(Binder binder) {
return binder.bindList(DataChannelQueryFilter.class);
}
@@ -220,7 +220,7 @@ public class CoreModule implements Module {
* @since 4.1
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<DataChannelSyncFilter> contributeDomainSyncFilters(Binder binder) {
return binder.bindList(DataChannelSyncFilter.class);
}
@@ -233,7 +233,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<Object> contributeDomainListeners(Binder binder) {
return binder.bindList(Object.class, Constants.DOMAIN_LISTENERS_LIST);
}
@@ -247,7 +247,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<DbAdapterDetector> contributeAdapterDetectors(Binder binder) {
return binder.bindList(DbAdapterDetector.class, Constants.ADAPTER_DETECTORS_LIST);
}
@@ -261,7 +261,7 @@ public class CoreModule implements Module {
* @since 4.1
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static MapBuilder<PkGenerator> contributePkGenerators(Binder binder) {
return binder.bindMap(PkGenerator.class);
}
@@ -275,7 +275,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static MapBuilder<String> contributeProperties(Binder binder) {
return binder.bindMap(String.class, Constants.PROPERTIES_MAP);
}
@@ -289,7 +289,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<ExtendedTypeFactory> contributeTypeFactories(Binder binder) {
return binder.bindList(ExtendedTypeFactory.class, Constants.TYPE_FACTORIES_LIST);
}
@@ -304,7 +304,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<ExtendedType> contributeDefaultTypes(Binder binder) {
return binder.bindList(ExtendedType.class, Constants.DEFAULT_TYPES_LIST);
}
@@ -319,7 +319,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<ExtendedType> contributeUserTypes(Binder binder) {
return binder.bindList(ExtendedType.class, Constants.USER_TYPES_LIST);
}
@@ -330,7 +330,7 @@ public class CoreModule implements Module {
* @since 4.0
* @deprecated in favor of {@link #extend(Binder)} API
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public static ListBuilder<ValueObjectType> contributeValueObjectTypes(Binder binder) {
return binder.bindList(ValueObjectType.class);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java b/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
index 270c52ccb..e471f7235 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
@@ -32,7 +32,7 @@ import java.util.Collections;
* ServerRuntime is the default Cayenne stack that you should be using in all apps with the exception of client-side ROP.</p>
*
* @since 3.1
- * @deprecated since 5.0, use {@link CayenneRuntime} class instead
+ * @deprecated use {@link CayenneRuntime} class instead
*/
@Deprecated(since = "5.0", forRemoval = true)
public class ServerRuntime extends CayenneRuntime {
@@ -44,7 +44,7 @@ public class ServerRuntime extends CayenneRuntime {
*
* @return a builder of CayenneRuntime.
* @since 4.0
- * @deprecated since 5.0, use {@link CayenneRuntime#builder()} instead
+ * @deprecated use {@link CayenneRuntime#builder()} instead
*/
@Deprecated(since = "5.0", forRemoval = true)
public static CayenneRuntimeBuilder builder() {
@@ -57,7 +57,7 @@ public class ServerRuntime extends CayenneRuntime {
*
* @param name optional symbolic name of the created runtime.
* @return a named builder of CayenneRuntime.
- * @deprecated since 5.0, use {@link CayenneRuntime#builder(String)} instead
+ * @deprecated use {@link CayenneRuntime#builder(String)} instead
*/
@Deprecated(since = "5.0", forRemoval = true)
public static CayenneRuntimeBuilder builder(String name) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/package-info.java b/cayenne/src/main/java/org/apache/cayenne/configuration/server/package-info.java
index 943f5164e..dc5f9cc81 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/package-info.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/server/package-info.java
@@ -22,7 +22,7 @@
* <p>
* See <a href="https://issues.apache.org/jira/browse/CAY-2820">JIRA</a> for details.
*
- * @deprecated since 5.0
+ * @deprecated
* @see org.apache.cayenne.configuration.runtime
* @see org.apache.cayenne.runtime
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java
index 6590b4ce0..c76a336ea 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java
@@ -269,9 +269,9 @@ public interface DbAdapter {
EJBQLTranslator getEjbqlTranslator();
/**
- * @deprecated since 5.0 in favor of {@link #getEjbqlTranslator()}.
+ * @deprecated in favor of {@link #getEjbqlTranslator()}.
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
default EJBQLTranslator getEjbqlTranslatorFactory() {
return getEjbqlTranslator();
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
index e60fc76fa..b7c10530a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
@@ -612,9 +612,9 @@ public class JdbcAdapter implements DbAdapter {
}
/**
- * @deprecated since 5.0 in favor of {@link #setEjbqlTranslator(EJBQLTranslator)}.
+ * @deprecated in favor of {@link #setEjbqlTranslator(EJBQLTranslator)}.
*/
- @Deprecated(since = "5.0")
+ @Deprecated(since = "5.0", forRemoval = true)
public void setEjbqlTranslatorFactory(EJBQLTranslator ejbqlTranslator) {
setEjbqlTranslator(ejbqlTranslator);
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/TraversalHelper.java b/cayenne/src/main/java/org/apache/cayenne/exp/TraversalHelper.java
index 4c8161a65..08ffe9d62 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/TraversalHelper.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/TraversalHelper.java
@@ -24,7 +24,7 @@ package org.apache.cayenne.exp;
* Useful as a superclass for partial implementations
* of TraversalHandler.
*
- * @deprecated since 5.0 as {@link TraversalHandler} has default no-op implementations for all methods
+ * @deprecated as {@link TraversalHandler} has default no-op implementations for all methods
*/
@Deprecated(since = "5.0", forRemoval = true)
public class TraversalHelper implements TraversalHandler {
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/property/CollectionProperty.java b/cayenne/src/main/java/org/apache/cayenne/exp/property/CollectionProperty.java
index 53d4f75f7..cb44ad87f 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/property/CollectionProperty.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/property/CollectionProperty.java
@@ -65,7 +65,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression representing equality to a value.
- * @deprecated since 5.0 in favour of {@link #containsValue(V)}
+ * @deprecated in favour of {@link #containsValue(V)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression contains(V value) {
@@ -74,7 +74,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression representing equality to a value.
- * @deprecated since 5.0 in favour of {@link #notContainsValue(V)}
+ * @deprecated in favour of {@link #notContainsValue(V)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression notContains(V value) {
@@ -83,7 +83,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects with values in the given set.
- * @deprecated since 5.0 in favour of {@link #containsValues(V...)}
+ * @deprecated in favour of {@link #containsValues(V...)}
*/
@SuppressWarnings("unchecked")
@Deprecated(since = "5.0", forRemoval = true)
@@ -100,7 +100,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects with values in the given set.
- * @deprecated since 5.0 in favour of {@link #containsValuesCollection(Collection)}
+ * @deprecated in favour of {@link #containsValuesCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression contains(Collection<V> values) {
@@ -117,7 +117,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects with given id set
- * @deprecated since 5.0 in favour of {@link #containsIds(Object...)}
+ * @deprecated in favour of {@link #containsIds(Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression containsId(Object firstId, Object... moreId) {
@@ -136,7 +136,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects with given id set.
- * @deprecated since 5.0 in favour of {@link #containsIdsCollection(Collection)}
+ * @deprecated in favour of {@link #containsIdsCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression containsId(Collection<Object> ids) {
@@ -153,7 +153,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects without given id set.
- * @deprecated since 5.0 in favour of {@link #notContainsIds(Object...)}
+ * @deprecated in favour of {@link #notContainsIds(Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression notContainsId(Object firstId, Object... moreId) {
@@ -172,7 +172,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects without given id set.
- * @deprecated since 5.0 in favour of {@link #notContainsIdsCollection(Collection)}
+ * @deprecated in favour of {@link #notContainsIdsCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression notContainsId(Collection<Object> ids) {
@@ -181,7 +181,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects with values not in the given set.
- * @deprecated since 5.0 in favour of {@link #notContainsValuesCollection(Collection)}
+ * @deprecated in favour of {@link #notContainsValuesCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression notContains(Collection<V> values) {
@@ -190,7 +190,7 @@ public abstract class CollectionProperty<V extends Persistent, E extends Collect
/**
* @return An expression for finding objects with values not in the given set.
- * @deprecated since 5.0 in favour of {@link #notContainsValues(V...)}
+ * @deprecated in favour of {@link #notContainsValues(V...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
@SafeVarargs
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/property/EntityProperty.java b/cayenne/src/main/java/org/apache/cayenne/exp/property/EntityProperty.java
index c8cc078b5..59dba8ca2 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/property/EntityProperty.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/property/EntityProperty.java
@@ -62,7 +62,7 @@ public class EntityProperty<E extends Persistent> extends BaseProperty<E> implem
}
/**
- * @deprecated since 5.0 in favour of {@link #idsInCollection(Collection)}
+ * @deprecated in favour of {@link #idsInCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression inId(Collection<Object> ids) {
@@ -80,7 +80,7 @@ public class EntityProperty<E extends Persistent> extends BaseProperty<E> implem
}
/**
- * @deprecated since 5.0 in favour of {@link #idsIn(Object...)}
+ * @deprecated in favour of {@link #idsIn(Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression inId(Object firstId, Object... moreIds) {
@@ -105,7 +105,7 @@ public class EntityProperty<E extends Persistent> extends BaseProperty<E> implem
}
/**
- * @deprecated since 5.0 in favour of {@link #idsNotInCollection(Collection)}
+ * @deprecated in favour of {@link #idsNotInCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression ninId(Collection<Object> ids) {
@@ -123,7 +123,7 @@ public class EntityProperty<E extends Persistent> extends BaseProperty<E> implem
}
/**
- * @deprecated since 5.0 in favour of {@link #idsNotIn(Object...)}
+ * @deprecated in favour of {@link #idsNotIn(Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression ninId(Object firstId, Object... moreIds) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/property/MapProperty.java b/cayenne/src/main/java/org/apache/cayenne/exp/property/MapProperty.java
index 4b015cd28..ef1875d6b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/exp/property/MapProperty.java
+++ b/cayenne/src/main/java/org/apache/cayenne/exp/property/MapProperty.java
@@ -90,7 +90,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects with values in the given set.
- * @deprecated since 5.0 in favour of {@link #containsValues(V...)}
+ * @deprecated in favour of {@link #containsValues(V...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
@SafeVarargs
@@ -119,7 +119,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects with values in the given set.
- * @deprecated since 5.0 in favour of {@link #containsValuesCollection(Collection)}
+ * @deprecated in favour of {@link #containsValuesCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression contains(Collection<V> values) {
@@ -136,7 +136,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects with values not in the given set.
- * @deprecated since 5.0 in favour of {@link #notContainsValuesCollection(Collection)}
+ * @deprecated in favour of {@link #notContainsValuesCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression notContains(Collection<V> values) {
@@ -153,7 +153,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects with values not in the given set.
- * @deprecated since 5.0 in favour of {@link #notContainsValues(V...)}
+ * @deprecated in favour of {@link #notContainsValues(V...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
@SafeVarargs
@@ -190,7 +190,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects with given id set
- * @deprecated since 5.0 in favour of {@link #containsIds(Object...)}
+ * @deprecated in favour of {@link #containsIds(Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression containsId(Object firstId, Object... moreId) {
@@ -217,7 +217,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects with given id set.
- * @deprecated since 5.0 in favour of {@link #containsIdsCollection(Collection)}
+ * @deprecated in favour of {@link #containsIdsCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression containsId(Collection<Object> ids) {
@@ -243,7 +243,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects without given id set.
- * @deprecated since 5.0 in favour of {@link #notContainsIds(Object...)}
+ * @deprecated in favour of {@link #notContainsIds(Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression notContainsId(Object firstId, Object... moreId) {
@@ -270,7 +270,7 @@ public class MapProperty<K, V extends Persistent> extends BaseProperty<Map<K, V>
/**
* @return An expression for finding objects without given id set.
- * @deprecated since 5.0 in favour of {@link #notContainsIdsCollection(Collection)}
+ * @deprecated in favour of {@link #notContainsIdsCollection(Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public Expression notContainsId(Collection<Object> ids) {
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 c95437585..1de5d3eeb 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/ObjRelationship.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/ObjRelationship.java
@@ -664,7 +664,6 @@ public class ObjRelationship extends Relationship<ObjEntity, ObjAttribute, ObjRe
/**
* Recalculates a new readonly value based on the underlying DbRelationships.
- * @deprecated since 4.2
*/
@Deprecated(since = "4.2")
public void recalculateReadOnlyValue() {
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/RefreshQuery.java b/cayenne/src/main/java/org/apache/cayenne/query/RefreshQuery.java
index 43a9ca0ab..be5b8d33a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/RefreshQuery.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/RefreshQuery.java
@@ -41,7 +41,7 @@ public class RefreshQuery implements Query {
* Creates a RefreshQuery that does full refresh of all registered objects, cascading
* refresh all the way to the shared cache.
*
- * @deprecated since 4.0, "refresh all" query will drop all cache contents
+ * @deprecated "refresh all" query will drop all cache contents
* @see org.apache.cayenne.cache.QueryCache#clear()
*/
@Deprecated
diff --git a/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java b/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java
index 82cc38f5b..4796a56fc 100644
--- a/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java
+++ b/cayenne/src/main/java/org/apache/cayenne/query/SelectById.java
@@ -180,7 +180,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #queryId(Class, Object)}
+ * @deprecated use {@link #queryId(Class, Object)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static <T> SelectById<T> query(Class<T> entityType, Object id) {
@@ -189,7 +189,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #queryMap(Class, Map)}
+ * @deprecated use {@link #queryMap(Class, Map)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static <T> SelectById<T> query(Class<T> entityType, Map<String, ?> id) {
@@ -198,7 +198,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #queryObjectId(Class, ObjectId)}
+ * @deprecated use {@link #queryObjectId(Class, ObjectId)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static <T> SelectById<T> query(Class<T> entityType, ObjectId id) {
@@ -207,7 +207,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #queryIds(Class, Object...)}
+ * @deprecated use {@link #queryIds(Class, Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static <T> SelectById<T> query(Class<T> entityType, Object firstId, Object... otherIds) {
@@ -218,7 +218,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #queryIdsCollection(Class, Collection)}
+ * @deprecated use {@link #queryIdsCollection(Class, Collection)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static <T> SelectById<T> query(Class<T> entityType, Collection<Object> ids) {
@@ -229,7 +229,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #queryMaps(Class, Map[])}
+ * @deprecated use {@link #queryMaps(Class, Map[])}
*/
@Deprecated(since = "5.0", forRemoval = true)
@SafeVarargs
@@ -241,7 +241,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #queryObjectIds(Class, ObjectId...)}
+ * @deprecated use {@link #queryObjectIds(Class, ObjectId...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static <T> SelectById<T> query(Class<T> entityType, ObjectId firstId, ObjectId... otherIds) {
@@ -380,7 +380,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/* Deprecated since 5.0 DataRow factory methods */
/**
- * @deprecated since 5.0, use {@link #dataRowQueryId(Class, Object)}
+ * @deprecated use {@link #dataRowQueryId(Class, Object)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static SelectById<DataRow> dataRowQuery(Class<?> entityType, Object id) {
@@ -388,7 +388,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
}
/**
- * @deprecated since 5.0, use {@link #dataRowQueryMap(Class, Map)}
+ * @deprecated use {@link #dataRowQueryMap(Class, Map)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static SelectById<DataRow> dataRowQuery(Class<?> entityType, Map<String, ?> id) {
@@ -396,7 +396,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
}
/**
- * @deprecated since 5.0, use {@link #dataRowQueryObjectId(ObjectId)}
+ * @deprecated use {@link #dataRowQueryObjectId(ObjectId)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static SelectById<DataRow> dataRowQuery(ObjectId id) {
@@ -405,7 +405,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #dataRowQueryIds(Class, Object...)}
+ * @deprecated use {@link #dataRowQueryIds(Class, Object...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static SelectById<DataRow> dataRowQuery(Class<?> entityType, Object firstId, Object... otherIds) {
@@ -416,7 +416,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #dataRowQueryMaps(Class, Map[])}
+ * @deprecated use {@link #dataRowQueryMaps(Class, Map[])}
*/
@Deprecated(since = "5.0", forRemoval = true)
@SafeVarargs
@@ -428,7 +428,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
/**
* @since 4.2
- * @deprecated since 5.0, use {@link #dataRowQueryObjectIds(ObjectId...)}
+ * @deprecated use {@link #dataRowQueryObjectIds(ObjectId...)}
*/
@Deprecated(since = "5.0", forRemoval = true)
public static SelectById<DataRow> dataRowQuery(ObjectId firstId, ObjectId... otherIds) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java
index 51b4ca5a0..3c87ae3bf 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java
@@ -94,7 +94,7 @@ public interface ClassDescriptor {
* <pre>
* this.getObjectClass().isAssignableFrom(objectClass)
* </pre>
- * @deprecated since 5.0, will throw UnsupportedOperationException on invocation,
+ * @deprecated will throw UnsupportedOperationException on invocation,
* use {@link #getSubclassDescriptor(String)}
*/
@Deprecated(since = "5.0", forRemoval = true)
diff --git a/cayenne/src/main/java/org/apache/cayenne/util/Util.java b/cayenne/src/main/java/org/apache/cayenne/util/Util.java
index 95273341b..ccce61697 100644
--- a/cayenne/src/main/java/org/apache/cayenne/util/Util.java
+++ b/cayenne/src/main/java/org/apache/cayenne/util/Util.java
@@ -624,7 +624,7 @@ public class Util {
* single-dimensional arrays and primitive types.
*
* @since 1.2
- * @deprecated since 4.0 this method based on statically defined class
+ * @deprecated this method based on statically defined class
* loading algorithm is not going to work in environments like
* OSGi. {@link AdhocObjectFactory} should be used as it can
* provide the environment-specific class loading policy.
diff --git a/cayenne/src/test/java/org/apache/cayenne/cache/MockQueryCache.java b/cayenne/src/test/java/org/apache/cayenne/cache/MockQueryCache.java
index 39ee19fc4..a550a3f70 100644
--- a/cayenne/src/test/java/org/apache/cayenne/cache/MockQueryCache.java
+++ b/cayenne/src/test/java/org/apache/cayenne/cache/MockQueryCache.java
@@ -18,12 +18,14 @@
****************************************************************/
package org.apache.cayenne.cache;
-import java.util.List;
-
import org.apache.cayenne.query.QueryMetadata;
+import java.util.List;
+
public class MockQueryCache implements QueryCache {
+ @Deprecated(since = "4.0")
+ @Override
public void clear() {
}