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 2014/11/02 10:36:33 UTC
[1/3] CAY-1965 Change version from 3.2 to 4.0
Repository: cayenne
Updated Branches:
refs/heads/master 0bb7946d9 -> 777b1d650
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
index 6fc244b..64c73d4 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
@@ -122,7 +122,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
/**
* @since 3.0
- * @deprecated since 3.2 does nothing. Previously it used to create runtime
+ * @deprecated since 4.0 does nothing. Previously it used to create runtime
* ObjRelationships, that broke a lot of things.
*/
@Deprecated
@@ -241,7 +241,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2 use {@link #getResults()}.
+ * @deprecated since 4.0 use {@link #getResults()}.
*/
@Deprecated
public Collection<SQLResult> getResultSets() {
@@ -249,7 +249,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public Collection<SQLResult> getResults() {
return mappingCache.getResults();
@@ -371,7 +371,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
/**
* Removes all entity mappings from the cache.
*
- * @deprecated since 3.2 in favor of {@link #refreshMappingCache()}.
+ * @deprecated since 4.0 in favor of {@link #refreshMappingCache()}.
*/
@Deprecated
public void clearCache() {
@@ -382,7 +382,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
* Refreshes entity cache to reflect the current state of the DataMaps in
* the EntityResolver.
*
- * @since 3.2
+ * @since 4.0
*/
public void refreshMappingCache() {
mappingCache = new ProxiedMappingNamespace() {
@@ -427,7 +427,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public EntityInheritanceTree getInheritanceTree(String entityName) {
@@ -448,7 +448,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2 use {@link #getInheritanceTree(String)}.
+ * @deprecated since 4.0 use {@link #getInheritanceTree(String)}.
*/
@Deprecated
public EntityInheritanceTree lookupInheritanceTree(String entityName) {
@@ -462,7 +462,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
* @return the required ObjEntity or null if there is none that matches the
* specifier
*
- * @since 3.2
+ * @since 4.0
*/
public ObjEntity getObjEntity(Class<?> entityClass) {
ObjEntity result = mappingCache.getObjEntity(entityClass);
@@ -477,7 +477,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2, use {@link #getObjEntity(Class)}.
+ * @deprecated since 4.0, use {@link #getObjEntity(Class)}.
*/
public ObjEntity lookupObjEntity(Class<?> entityClass) {
return getObjEntity(entityClass);
@@ -492,7 +492,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
* ObjEntity that services the specified data Object
*
* @return the required ObjEntity, or null if none matches the specifier
- * @since 3.2 a corresponding getObjEntity method should be used.
+ * @since 4.0 a corresponding getObjEntity method should be used.
*/
@Deprecated
public ObjEntity lookupObjEntity(Object object) {
@@ -513,7 +513,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2. Use q.getMetaData(resolver).getProcedure()
+ * @deprecated since 4.0. Use q.getMetaData(resolver).getProcedure()
*/
@Deprecated
public Procedure lookupProcedure(Query q) {
@@ -521,7 +521,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2 use {@link #getProcedure(String)}.
+ * @deprecated since 4.0 use {@link #getProcedure(String)}.
*/
@Deprecated
public Procedure lookupProcedure(String procedureName) {
@@ -529,7 +529,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2 use {@link #getQuery(String)}.
+ * @deprecated since 4.0 use {@link #getQuery(String)}.
*/
@Deprecated
public Query lookupQuery(String name) {
@@ -543,7 +543,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2. There's no replacement. This property is
+ * @deprecated since 4.0. There's no replacement. This property is
* meaningless and is no longer respected by the code.
*/
@Deprecated
@@ -552,7 +552,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
}
/**
- * @deprecated since 3.2. There's no replacement. This property is
+ * @deprecated since 4.0. There's no replacement. This property is
* meaningless.
*/
public void setIndexedByClass(boolean b) {
@@ -598,7 +598,7 @@ public class EntityResolver implements MappingNamespace, Serializable {
/**
* @since 3.0
- * @deprecated since 3.2 this method does nothing, as EntityResolver no
+ * @deprecated since 4.0 this method does nothing, as EntityResolver no
* longer loads listeners from its DataMaps.
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
index e185a70..55358b8 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
@@ -32,7 +32,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
- * @since 3.2
+ * @since 4.0
*/
class MappingCache implements MappingNamespace {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
index d35d788..ab0e414 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
@@ -41,7 +41,7 @@ public interface MappingNamespace {
Embeddable getEmbeddable(String className);
/**
- * @since 3.2
+ * @since 4.0
*/
Collection<Embeddable> getEmbeddables();
@@ -53,7 +53,7 @@ public interface MappingNamespace {
SQLResult getResult(String name);
/**
- * @since 3.2
+ * @since 4.0
*/
Collection<SQLResult> getResults();
@@ -102,17 +102,17 @@ public interface MappingNamespace {
Collection<Query> getQueries();
/**
- * @since 3.2
+ * @since 4.0
*/
EntityInheritanceTree getInheritanceTree(String entityName);
/**
- * @since 3.2
+ * @since 4.0
*/
ObjEntity getObjEntity(Class<?> entityClass);
/**
- * @since 3.2
+ * @since 4.0
*/
ObjEntity getObjEntity(Persistent object);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java b/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
index 6fb47de..dba2c08 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/ObjEntity.java
@@ -285,7 +285,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
* specified explicitly, default DataMap superclass is used, and if it is
* not set - CayenneDataObject is used.
*
- * @since 3.2
+ * @since 4.0
*/
public String getJavaClassName() {
String name = getClassName();
@@ -308,7 +308,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
* Casts any thrown exceptions into CayenneRuntimeException.
*
* @since 1.2
- * @deprecated since 3.2 this method based on statically defined class
+ * @deprecated since 4.0 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.
@@ -330,7 +330,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
* not just a generic Collection is returned.
*
* @since 3.0
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
@@ -344,7 +344,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
* @since 3.0
* @throws IllegalArgumentException
* if a listener for the same class name is already registered.
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
@@ -362,7 +362,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
* Removes a listener matching class name.
*
* @since 3.0
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
@@ -379,7 +379,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
/**
* @since 3.0
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
@@ -1118,7 +1118,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
}
/**
- * @since 3.2
+ * @since 4.0
*/
public Set<String> getCallbackMethods() {
Set<String> res = new LinkedHashSet<String>();
@@ -1252,7 +1252,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
* this entity lifecycle events.
*
* @since 3.0
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
@@ -1261,7 +1261,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
}
/**
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
@@ -1274,7 +1274,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
* not be notified of this entity lifecycle events.
*
* @since 3.0
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
@@ -1283,7 +1283,7 @@ public class ObjEntity extends Entity implements ObjEntityListener, Configuratio
}
/**
- * @deprecated since 3.2 unused, as listeners are no longer mapped in a
+ * @deprecated since 4.0 unused, as listeners are no longer mapped in a
* DataMap.
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
index c9989d4..0117a4f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.map.naming;
import org.apache.cayenne.map.DataMap;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultUniqueNameGenerator implements UniqueNameGenerator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameChecker.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameChecker.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameChecker.java
index 07e5ce7..573e25a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameChecker.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameChecker.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.map.naming;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface NameChecker {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
index ea8f393..20b250c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.map.ProcedureParameter;
import org.apache.commons.lang.StringUtils;
/**
- * @since 3.2
+ * @since 4.0
*/
public enum NameCheckers implements NameChecker {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/naming/ObjectNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/ObjectNameGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/ObjectNameGenerator.java
index 59003a5..fac5e32 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/ObjectNameGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/ObjectNameGenerator.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.DbRelationship;
* ObjectNameGenerator is a strategy for creating names for entities,
* attributes, relationships from DB metadata.
*
- * @since 3.2
+ * @since 4.0
*/
public interface ObjectNameGenerator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/naming/UniqueNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/UniqueNameGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/UniqueNameGenerator.java
index 9aabf61..d56f856 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/UniqueNameGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/UniqueNameGenerator.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.map.naming;
* A "filter" for the mapping artifact names generated elsewhere that ensures no
* duplicate names are generated.
*
- * @since 3.2
+ * @since 4.0
*/
public interface UniqueNameGenerator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
index 5699718..1df4b3b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
@@ -50,14 +50,14 @@ public abstract class BatchQuery implements Query {
protected DataMap dataMap;
/**
- * @since 3.2
+ * @since 4.0
*/
protected List<BatchQueryRow> rows;
protected List<DbAttribute> dbAttributes;
/**
- * @since 3.2
+ * @since 4.0
*/
public BatchQuery(DbEntity dbEntity, List<DbAttribute> dbAttributes, int batchCapacity) {
this.dbEntity = dbEntity;
@@ -66,7 +66,7 @@ public abstract class BatchQuery implements Query {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public List<BatchQueryRow> getRows() {
return rows;
@@ -159,7 +159,7 @@ public abstract class BatchQuery implements Query {
}
/**
- * @deprecated since 3.2 use getRows().size().
+ * @deprecated since 4.0 use getRows().size().
*/
@Deprecated
public int size() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQueryRow.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQueryRow.java b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQueryRow.java
index 543c046..e49e379 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQueryRow.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQueryRow.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.Factory;
/**
* Represents a single row of values in a BatchQuery.
*
- * @since 3.2
+ * @since 4.0
*/
public abstract class BatchQueryRow {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
index c02dd5e..c62f149 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
@@ -122,7 +122,7 @@ public class EJBQLQuery implements Query, XMLSerializable {
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useLocalCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
@@ -138,7 +138,7 @@ public class EJBQLQuery implements Query, XMLSerializable {
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useSharedCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
index 2f844ba..f546e80 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
@@ -334,7 +334,7 @@ public class ProcedureQuery extends AbstractQuery implements ParameterizedQuery,
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useLocalCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
@@ -350,7 +350,7 @@ public class ProcedureQuery extends AbstractQuery implements ParameterizedQuery,
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useSharedCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/QueryRouter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryRouter.java b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryRouter.java
index a0bd52c..39a89c4 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryRouter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryRouter.java
@@ -47,7 +47,7 @@ public interface QueryRouter {
* QueryEngine is returned. If there's no default engine, an exception is
* thrown.
*
- * @since 3.2
+ * @since 4.0
*/
QueryEngine engineForName(String name);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java
index 2d6b675..3f75291 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLSelect.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.map.SQLResult;
/**
* A selecting query based on raw SQL and featuring fluent API.
*
- * @since 3.2
+ * @since 4.0
*/
public class SQLSelect<T> extends IndirectQuery implements Select<T> {
@@ -221,7 +221,7 @@ public class SQLSelect<T> extends IndirectQuery implements Select<T> {
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useLocalCache(String... cacheGroups) {
cacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
index bbc9009..ee8e10e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
@@ -105,7 +105,7 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery,
/**
* Creates a SQLTemplate without an explicit root.
*
- * @since 3.2
+ * @since 4.0
*/
public SQLTemplate(String defaultTemplate, boolean isFetchingDataRows) {
setDefaultTemplate(defaultTemplate);
@@ -396,7 +396,7 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery,
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useLocalCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
@@ -412,7 +412,7 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery,
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useSharedCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
@@ -670,7 +670,7 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery,
* information will be used during query execution if no other routing
* information is provided such as entity name or class, etc.
*
- * @since 3.2
+ * @since 4.0
*/
public String getDataNodeName() {
return dataNodeName;
@@ -681,7 +681,7 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery,
* information will be used during query execution if no other routing
* information is provided such as entity name or class, etc.
*
- * @since 3.2
+ * @since 4.0
*/
public void setDataNodeName(String dataNodeName) {
this.dataNodeName = dataNodeName;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
index a0c5c37..bec8c75 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.map.ObjEntity;
/**
* A query to select single objects by id.
*
- * @since 3.2
+ * @since 4.0
*/
public class SelectById<T> extends IndirectQuery implements Select<T> {
@@ -141,7 +141,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T> {
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public SelectById<T> useLocalCache(String... cacheGroups) {
cacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
index 2c559ae..b6decbc 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
@@ -58,7 +58,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* @param rootClass
* the Class of objects fetched by this query.
*
- * @since 3.2
+ * @since 4.0
*/
public static <T> SelectQuery<T> query(Class<T> rootClass) {
return new SelectQuery<T>(rootClass);
@@ -73,7 +73,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* @param qualifier
* an Expression indicating which objects should be fetched.
*
- * @since 3.2
+ * @since 4.0
*/
public static <T> SelectQuery<T> query(Class<T> rootClass, Expression qualifier) {
return new SelectQuery<T>(rootClass, qualifier);
@@ -90,14 +90,14 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* @param orderings
* defines how to order the results, may be null.
*
- * @since 3.2
+ * @since 4.0
*/
public static <T> SelectQuery<T> query(Class<T> rootClass, Expression qualifier, List<? extends Ordering> orderings) {
return new SelectQuery<T>(rootClass, qualifier, orderings);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public static SelectQuery<DataRow> dataRowQuery(Class<?> rootClass) {
// create a query replica that would fetch DataRows
@@ -118,7 +118,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* @param qualifier
* an Expression indicating which objects should be fetched.
*
- * @since 3.2
+ * @since 4.0
*/
public static SelectQuery<DataRow> dataRowQuery(Class<?> rootClass, Expression qualifier) {
SelectQuery<DataRow> query = dataRowQuery(rootClass);
@@ -127,7 +127,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
}
/**
- * @since 3.2
+ * @since 4.0
*/
public static SelectQuery<DataRow> dataRowQuery(Class<?> rootClass, Expression qualifier, List<Ordering> orderings) {
SelectQuery<DataRow> query = dataRowQuery(rootClass, qualifier);
@@ -584,7 +584,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
/**
* Adds a prefetch with specified relationship path to the query.
*
- * @since 3.2
+ * @since 4.0
*/
public PrefetchTreeNode addPrefetch(PrefetchTreeNode prefetchElement) {
String path = prefetchElement.getPath();
@@ -623,7 +623,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* rows as opposed to DataObjects, <code>false</code> for DataObjects. This
* is a hint to QueryEngine executing this query.
*
- * @deprecated since 3.2, use {@link #dataRowQuery(Class, Expression)} to
+ * @deprecated since 4.0, use {@link #dataRowQuery(Class, Expression)} to
* create DataRow query instead.
*/
public boolean isFetchingDataRows() {
@@ -638,7 +638,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* setting has no effect, and data rows are always fetched. </i>
* </p>
*
- * @deprecated since 3.2, use {@link #dataRowQuery(Class, Expression)} to
+ * @deprecated since 4.0, use {@link #dataRowQuery(Class, Expression)} to
* create DataRow query instead.
*/
public void setFetchingDataRows(boolean flag) {
@@ -682,7 +682,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useLocalCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
@@ -698,7 +698,7 @@ public class SelectQuery<T> extends AbstractQuery implements ParameterizedQuery,
* query.setCacheGroups("group1", "group2");
* </pre>
*
- * @since 3.2
+ * @since 4.0
*/
public void useSharedCache(String... cacheGroups) {
setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/reflect/ArcProperty.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/ArcProperty.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/ArcProperty.java
index d17c0a8..d6339cf 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/ArcProperty.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/ArcProperty.java
@@ -41,7 +41,7 @@ public interface ArcProperty extends PropertyDescriptor {
* Returns a path over reverse DbRelationships for this arc's
* ObjRelationship.
*
- * @since 3.2
+ * @since 4.0
*/
String getComplimentaryReverseDbRelationshipPath();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
index a87f694..51e464c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
@@ -282,7 +282,7 @@ public class ConverterFactory {
* the Class to convert a value to; the destination type
* @param converter
* a converter used to convert the value from Object to T
- * @since 3.2
+ * @since 4.0
*/
public static <T> void addConverter(Class<? super T> type, Converter<T> converter) {
factory._addConverter(type, converter);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
index 7956c06..ccb612d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
@@ -153,14 +153,14 @@ public class LifecycleCallbackRegistry {
* Registers a callback method to be invoked on an entity class instances
* when a lifecycle event occurs.
*
- * @since 3.2
+ * @since 4.0
*/
public void addCallback(LifecycleEvent type, Class<?> entityClass, String methodName) {
eventCallbacks[type.ordinal()].addListener(entityClass, methodName);
}
/**
- * @since 3.2 renamed to {@link #addCallback(LifecycleEvent, Class, String)}.
+ * @since 4.0 renamed to {@link #addCallback(LifecycleEvent, Class, String)}.
*/
@Deprecated
public void addListener(LifecycleEvent type, Class<?> entityClass, String methodName) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java
index db2d5aa..5b9038c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java
@@ -23,7 +23,7 @@ package org.apache.cayenne.reflect;
* Defines bean property API used by Cayenne to access object data, do faulting
* and graph maintenance tasks.
*
- * @since 3.2
+ * @since 4.0
*/
public interface PropertyDescriptor extends Property {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java b/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java
index 87768b6..8841d0a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java
@@ -115,7 +115,7 @@ public class RemoteSession implements Serializable {
*
* @throws CayenneRuntimeException if EventBridge startup fails for any reason.
*
- * @deprecated since 3.2. Factory creation should is handled by the client connection.
+ * @deprecated since 4.0. Factory creation should is handled by the client connection.
*/
@Deprecated
public EventBridge createServerEventBridge() throws CayenneRuntimeException {
@@ -162,14 +162,14 @@ public class RemoteSession implements Serializable {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public String getEventBridgeFactory() {
return eventBridgeFactory;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public Map<String, String> getEventBridgeParameters() {
return eventBridgeParameters != null ? eventBridgeParameters : Collections.<String, String> emptyMap();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/resource/ClassLoaderResourceLocator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/resource/ClassLoaderResourceLocator.java b/cayenne-server/src/main/java/org/apache/cayenne/resource/ClassLoaderResourceLocator.java
index 892495f..0985c04 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/resource/ClassLoaderResourceLocator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/resource/ClassLoaderResourceLocator.java
@@ -67,7 +67,7 @@ public class ClassLoaderResourceLocator implements ResourceLocator {
}
/**
- * @deprecated since 3.2 unused, as AdhocObjectFactory.getClassLoader() is
+ * @deprecated since 4.0 unused, as AdhocObjectFactory.getClassLoader() is
* used instead.
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/BaseTransaction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/BaseTransaction.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/BaseTransaction.java
index 10eb8c1..e82fd10 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/BaseTransaction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/BaseTransaction.java
@@ -27,7 +27,7 @@ import java.util.Map;
/**
* A Cayenne transaction. Currently supports managing JDBC connections.
*
- * @since 3.2
+ * @since 4.0
*/
public abstract class BaseTransaction implements Transaction {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
index 117607b..9c69db2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.log.JdbcEventLogger;
/**
* Represents a Cayenne-managed local Transaction.
*
- * @since 3.2
+ * @since 4.0
*/
public class CayenneTransaction extends BaseTransaction {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
index a6a67a1..8687204 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.log.JdbcEventLogger;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultTransactionFactory implements TransactionFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionManager.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionManager.java
index 7190756..b8c284c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionManager.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/DefaultTransactionManager.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.log.JdbcEventLogger;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultTransactionManager implements TransactionManager {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
index 62f68d6..168a2bc 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.log.JdbcEventLogger;
/**
* Represents a container-managed transaction.
*
- * @since 3.2
+ * @since 4.0
*/
public class ExternalTransaction extends BaseTransaction {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/Transaction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/Transaction.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/Transaction.java
index 2297456..efc47b8 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/Transaction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/Transaction.java
@@ -23,7 +23,7 @@ import java.sql.Connection;
/**
* A Cayenne Transaction interface.
*
- * @since 3.2
+ * @since 4.0
*/
public interface Transaction {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionFactory.java
index 5e14681..6c31eb5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionFactory.java
@@ -20,7 +20,7 @@ package org.apache.cayenne.tx;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface TransactionFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java
index 1ac75b3..142c503 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionManager.java
@@ -23,7 +23,7 @@ package org.apache.cayenne.tx;
* transactions. Users only rarely need to invoke it directly, as all standard
* Cayenne operations are managing their own transactions internally.
*
- * @since 3.2
+ * @since 4.0
*/
public interface TransactionManager {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionalOperation.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionalOperation.java b/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionalOperation.java
index c92ee65..94f519e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionalOperation.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/tx/TransactionalOperation.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.tx;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface TransactionalOperation<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java b/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
index 1b1fa90..6e999cb 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
@@ -114,14 +114,14 @@ public class EntityMergeSupport {
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected boolean removePK(DbEntity dbEntity) {
return removeMeaningfulPKs;
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected boolean removeFK(DbEntity dbEntity) {
return removeMeaningfulFKs;
@@ -420,14 +420,14 @@ public class EntityMergeSupport {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public boolean isUsePrimitives() {
return usePrimitives;
}
/**
- * @since 3.2
+ * @since 4.0
* @param usePrimitives
*/
public void setUsePrimitives(boolean usePrimitives) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java b/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
index 9eaa413..1d5ae49 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/Util.java
@@ -500,7 +500,7 @@ public class Util {
* single-dimensional arrays and primitive types.
*
* @since 1.2
- * @deprecated since 3.2 this method based on statically defined class
+ * @deprecated since 4.0 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.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_ParamsLegacyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_ParamsLegacyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_ParamsLegacyTest.java
index 4d367d6..efe4667 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_ParamsLegacyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/Expression_ParamsLegacyTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
/**
* Testing deprecated Expression.expWithParameters(..) API.
*
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Deprecated
public class Expression_ParamsLegacyTest {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensReversTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensReversTest.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensReversTest.java
index d7fd3b9..e13531e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensReversTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensReversTest.java
@@ -32,7 +32,7 @@ import static org.apache.cayenne.merge.builders.ObjectMother.dbAttr;
import static org.apache.cayenne.merge.builders.ObjectMother.dbEntity;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class TokensReversTest {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensToModelExecution.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensToModelExecution.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensToModelExecution.java
index 8203bbe..b5d63de 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensToModelExecution.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/TokensToModelExecution.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class TokensToModelExecution {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/Builder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/Builder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/Builder.java
index 334fe7c..fd379c7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/Builder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/Builder.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.merge.builders;
/**
* Base interface for all domain builders
*
- * @since 3.2.
+ * @since 4.0.
*/
public interface Builder<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DataMapBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DataMapBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DataMapBuilder.java
index 4975ec2..662ba2a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DataMapBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DataMapBuilder.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.ObjEntity;
import java.util.Collections;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class DataMapBuilder extends DefaultBuilder<DataMap> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbAttributeBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbAttributeBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbAttributeBuilder.java
index 9b90ec0..79be3ce 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbAttributeBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbAttributeBuilder.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.map.DbAttribute;
import static org.apache.commons.lang.StringUtils.isEmpty;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class DbAttributeBuilder extends DefaultBuilder<DbAttribute> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbEntityBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbEntityBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbEntityBuilder.java
index dd463e5..e0e4b7e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbEntityBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbEntityBuilder.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.commons.lang.StringUtils;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class DbEntityBuilder extends DefaultBuilder<DbEntity> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbRelationshipBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbRelationshipBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbRelationshipBuilder.java
index 7c08862..2bf5dba 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbRelationshipBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DbRelationshipBuilder.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class DbRelationshipBuilder extends DefaultBuilder<DbRelationship> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DefaultBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DefaultBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DefaultBuilder.java
index cc90555..6c37178 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DefaultBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/DefaultBuilder.java
@@ -22,7 +22,7 @@ import org.apache.commons.lang.StringUtils;
import org.fluttercode.datafactory.impl.DataFactory;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public abstract class DefaultBuilder<T> implements Builder<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjAttributeBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjAttributeBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjAttributeBuilder.java
index 1e86c2a..6a74936 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjAttributeBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjAttributeBuilder.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.merge.builders;
import org.apache.cayenne.map.ObjAttribute;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class ObjAttributeBuilder extends DefaultBuilder<ObjAttribute> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjEntityBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjEntityBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjEntityBuilder.java
index 7235440..dc78b29 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjEntityBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjEntityBuilder.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.commons.lang.StringUtils;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class ObjEntityBuilder extends DefaultBuilder<ObjEntity> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjectMother.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjectMother.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjectMother.java
index b83f88d..76ed761 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjectMother.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/builders/ObjectMother.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.map.DataMap;
* Factory for test data see pattern definition:
* http://martinfowler.com/bliki/ObjectMother.html
*
- * @since 3.2.
+ * @since 4.0.
*/
public class ObjectMother {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java b/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java
index 7ee7ca7..5d5a26d 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java
@@ -29,7 +29,7 @@ import org.jvnet.inflector.Noun;
* SmartNameGenerator is a strategy for generating names of entities, attributes
* etc.
*
- * @since 3.2
+ * @since 4.0
*/
public class DefaultNameGenerator implements ObjectNameGenerator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
index b63ce32..27ea1b2 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
@@ -37,7 +37,7 @@ import org.apache.tools.ant.Task;
*
* @since 1.2: Prior to 1.2 DataPort classes were a part of cayenne-examples
* package.
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Deprecated
class AntDataPortDelegate implements DataPortDelegate {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
index 45ef975..06c770f 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
@@ -43,7 +43,7 @@ import org.apache.tools.ant.Project;
*
* @since 1.2: Prior to 1.2 DataPort classes were a part of cayenne-examples
* package.
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Deprecated
public class DataPortTask extends CayenneTask {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index 530f8f9..b641759 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -39,13 +39,13 @@ public class DbImporterTask extends Task {
private final DbImportConfiguration parameters;
/**
- * @deprecated since 3.2 in favor of "schema"
+ * @deprecated since 4.0 in favor of "schema"
*/
@Deprecated
private String schemaName;
/**
- * @deprecated since 3.2 in favor of "meaningfulPkTable"
+ * @deprecated since 4.0 in favor of "meaningfulPkTable"
*/
@Deprecated
private boolean meaningfulPk;
@@ -114,28 +114,28 @@ public class DbImporterTask extends Task {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setOverwrite(boolean overwrite) {
parameters.setOverwrite(overwrite);
}
/**
- * @deprecated since 3.2 use {@link #setSchema(String)}
+ * @deprecated since 4.0 use {@link #setSchema(String)}
*/
public void setSchemaName(String schemaName) {
this.schemaName = schemaName;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setSchema(String schema) {
parameters.setSchema(schema);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setDefaultPackage(String defaultPackage) {
parameters.setDefaultPackage(defaultPackage);
@@ -154,14 +154,14 @@ public class DbImporterTask extends Task {
}
/**
- * @deprecated since 3.2 use {@link #setMeaningfulPkTables(String)}
+ * @deprecated since 4.0 use {@link #setMeaningfulPkTables(String)}
*/
public void setMeaningfulPk(boolean meaningfulPk) {
this.meaningfulPk = meaningfulPk;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setMeaningfulPkTables(String meaningfulPkTables) {
parameters.setMeaningfulPkTables(meaningfulPkTables);
@@ -196,21 +196,21 @@ public class DbImporterTask extends Task {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setIncludeTables(String includeTables) {
parameters.setIncludeTables(includeTables);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setExcludeTables(String excludeTables) {
parameters.setExcludeTables(excludeTables);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setUsePrimitives(boolean usePrimitives) {
parameters.setUsePrimitives(usePrimitives);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java
index 91041f5..c45eefd 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DriverDataSourceFactory implements DataSourceFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
index f96bf65..c6abcee 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/ToolsModule.java
@@ -56,7 +56,7 @@ import org.apache.commons.logging.Log;
* A DI module to bootstrap DI container for Cayenne Ant tasks and Maven
* plugins.
*
- * @since 3.2
+ * @since 4.0
*/
public class ToolsModule implements Module {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java
index a90881f..66acb77 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java
@@ -57,7 +57,7 @@ import java.util.List;
* A thin wrapper around {@link DbLoader} that encapsulates DB import logic for
* the benefit of Ant and Maven db importers.
*
- * @since 3.2
+ * @since 4.0
*/
public class DbImportAction {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
index b7e780a..4781466 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java
@@ -48,7 +48,7 @@ import java.util.Collections;
import static org.apache.commons.lang.StringUtils.isNotEmpty;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DbImportConfiguration {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java
index 39342c0..af1bf26 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
/**
- * @since 3.2
+ * @since 4.0
*/
class DbImportDbLoaderDelegate implements DbLoaderDelegate {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java
index 17f5558..f99a1b2 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.tools.configuration.ToolsModule;
* A DI module that bootstraps {@link DbImportAction}. Should be used in
* conjunction with {@link ToolsModule}.
*
- * @since 3.2
+ * @since 4.0
*/
public class DbImportModule implements Module {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
index 49f54d8..1ced5e9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
@@ -1793,14 +1793,14 @@ public class ProjectController extends CayenneController {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public int getEntityTabSelection() {
return entityTabSelection;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setEntityTabSelection(int entityTabSelection) {
this.entityTabSelection = entityTabSelection;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java
index 0492010..1925eaf 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java
@@ -53,7 +53,7 @@ public class EOModelHelper {
/**
* Creates helper instance and tries to locate EOModel and load index file.
*
- * @deprecated since 3.2, use {@link #EOModelHelper(URL)}.
+ * @deprecated since 4.0, use {@link #EOModelHelper(URL)}.
*/
@Deprecated
public EOModelHelper(String path) throws Exception {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
index d241738..a09f0a6 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
@@ -74,7 +74,7 @@ public class EOModelProcessor {
}
/**
- * @deprecated since 3.2 in favor of {@link #loadModeIndex(URL)}.
+ * @deprecated since 4.0 in favor of {@link #loadModeIndex(URL)}.
*/
@Deprecated
public Map loadModeIndex(String path) throws Exception {
@@ -84,7 +84,7 @@ public class EOModelProcessor {
/**
* Returns index.eomodeld contents as a Map.
*
- * @since 3.2
+ * @since 4.0
*/
// TODO: refactor EOModelHelper to provide a similar method without loading
// all entity files in memory... here we simply copied stuff from
@@ -109,7 +109,7 @@ public class EOModelProcessor {
}
/**
- * @deprecated since 3.2 in favor of {@link #loadEOModel(URL)}.
+ * @deprecated since 4.0 in favor of {@link #loadEOModel(URL)}.
*/
@Deprecated
public DataMap loadEOModel(String path) throws Exception {
@@ -117,7 +117,7 @@ public class EOModelProcessor {
}
/**
- * @deprecated since 3.2 in favor of {@link #loadEOModel(URL, boolean)}.
+ * @deprecated since 4.0 in favor of {@link #loadEOModel(URL, boolean)}.
*/
@Deprecated
public DataMap loadEOModel(String path, boolean generateClientClass) throws Exception {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index d8ea086..2a11e23 100644
--- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -57,7 +57,7 @@ public class DbImporterMojo extends AbstractMojo {
* will be used.
*
* @parameter expression="${cdbimport.defaultPackage}"
- * @since 3.2
+ * @since 4.0
*/
private String defaultPackage;
@@ -74,7 +74,7 @@ public class DbImporterMojo extends AbstractMojo {
* DB schema to use for DB importing.
*
* @parameter expression="${cdbimport.schemaName}"
- * @deprecated since 3.2 renamed to "schema"
+ * @deprecated since 4.0 renamed to "schema"
*/
private String schemaName;
@@ -82,7 +82,7 @@ public class DbImporterMojo extends AbstractMojo {
* DB schema to use for DB importing.
*
* @parameter expression="${cdbimport.catalog}"
- * @since 3.2
+ * @since 4.0
*/
private String catalog;
@@ -90,7 +90,7 @@ public class DbImporterMojo extends AbstractMojo {
* DB schema to use for DB importing.
*
* @parameter expression="${cdbimport.schema}"
- * @since 3.2
+ * @since 4.0
*/
private String schema;
@@ -146,13 +146,13 @@ public class DbImporterMojo extends AbstractMojo {
* Default is <code>false</code>.
*
* @parameter expression="${cdbimport.meaningfulPk}" default-value="false"
- * @deprecated since 3.2 use meaningfulPkTables
+ * @deprecated since 4.0 use meaningfulPkTables
*/
private boolean meaningfulPk;
/**
* @parameter expression="${cdbimport.meaningfulPkTables}"
- * @since 3.2
+ * @since 4.0
*/
private String meaningfulPkTables;
[2/3] CAY-1965 Change version from 3.2 to 4.0
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
index 5507bf4..f1e6419 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
@@ -46,7 +46,7 @@ public class SelectAction extends BaseSQLAction {
protected SelectQuery<?> query;
/**
- * @since 3.2
+ * @since 4.0
*/
public SelectAction(SelectQuery<?> query, DataNode dataNode) {
super(dataNode);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
index 68c455c..36fd8a9 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
@@ -41,7 +41,7 @@ import org.apache.cayenne.query.ScalarResultSegment;
import org.apache.cayenne.reflect.ClassDescriptor;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultRowReaderFactory implements RowReaderFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java
index 2b24a4e..a9de515 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.query.QueryMetadata;
/**
* Creates RowReader instances for executed queries.
*
- * @since 3.2
+ * @since 4.0
*/
public interface RowReaderFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchParameterBinding.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchParameterBinding.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchParameterBinding.java
index 491a3fb..a37a145 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchParameterBinding.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchParameterBinding.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.access.translator.batch;
import org.apache.cayenne.map.DbAttribute;
/**
- * @since 3.2
+ * @since 4.0
*/
public class BatchParameterBinding {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
index 7daf2f8..989fcf1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.query.BatchQueryRow;
/**
* Superclass of batch query translators.
*
- * @since 3.2
+ * @since 4.0
*/
public interface BatchTranslator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslatorFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslatorFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslatorFactory.java
index ebd01a9..425ad5e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslatorFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslatorFactory.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.query.BatchQuery;
* Factory which creates BatchQueryBuilders for different types of queries,
* which, in their turn, create SQL strings for batch queries.
*
- * @since 3.2
+ * @since 4.0
*/
public interface BatchTranslatorFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
index 0fa87ac..82f945e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.query.BatchQueryRow;
/**
* Superclass of batch query translators.
*
- * @since 3.2
+ * @since 4.0
*/
public abstract class DefaultBatchTranslator implements BatchTranslator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorFactory.java
index 52ec12c..b39837e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorFactory.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.query.UpdateBatchQuery;
/**
* Default implementation of {@link BatchTranslatorFactory}.
*
- * @since 3.2
+ * @since 4.0
*/
public class DefaultBatchTranslatorFactory implements BatchTranslatorFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteTranslatorFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteTranslatorFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteTranslatorFactory.java
index 1ca5ec9..b83a879 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteTranslatorFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteTranslatorFactory.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.query.DeleteBatchQuery;
* Implementation of {link #BatchTranslator}, which uses 'soft' delete
* (runs UPDATE and sets 'deleted' field to true instead-of running SQL DELETE)
*
- * @since 3.2
+ * @since 4.0
*/
public class SoftDeleteTranslatorFactory extends DefaultBatchTranslatorFactory {
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
index 4bf1b69..35d09d6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
@@ -355,14 +355,14 @@ public class QualifierTranslator extends QueryAssemblerHelper implements Travers
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected String operandForBitwiseLeftShift() {
return "<<";
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected String operandForBitwiseRightShift() {
return ">>";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssembler.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssembler.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssembler.java
index 93042d2..d83e6b2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssembler.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssembler.java
@@ -67,7 +67,7 @@ public abstract class QueryAssembler {
protected int parameterIndex;
/**
- * @since 3.2
+ * @since 4.0
*/
public QueryAssembler(Query query, DataNode dataNode, Connection connection) {
this.logger = dataNode.getJdbcEventLogger();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java
index 2a1fd0f..ad171be 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java
@@ -83,7 +83,7 @@ public class SelectTranslator extends QueryAssembler {
JoinStack joinStack;
/**
- * @since 3.2
+ * @since 4.0
*/
public SelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/util/DefaultOperationObserver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/util/DefaultOperationObserver.java b/cayenne-server/src/main/java/org/apache/cayenne/access/util/DefaultOperationObserver.java
index 2a6a6e1..217cf8e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/util/DefaultOperationObserver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/util/DefaultOperationObserver.java
@@ -124,7 +124,7 @@ public class DefaultOperationObserver implements OperationObserver {
* Closes ResultIterator without reading its data. If you implement a custom
* subclass, only call super if closing the iterator is what you need.
*
- * @since 3.2
+ * @since 4.0
*/
public void nextGeneratedRows(Query query, ResultIterator keys, org.apache.cayenne.ObjectId idToUpdate) {
if (keys != null) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
index bea693e..0424b09 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
@@ -140,7 +140,7 @@ public class EhCacheQueryCache implements QueryCache {
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected String cacheName(String key, String... cacheGroups) {
if (cacheGroups != null && cacheGroups.length > 0) {
@@ -196,7 +196,7 @@ public class EhCacheQueryCache implements QueryCache {
/**
* Returns default cache group.
*
- * @deprecated since 3.2 - this method is no longer in use. If you are
+ * @deprecated since 4.0 - this method is no longer in use. If you are
* overriding it, override {@link #cacheName(String, String...)}
* instead.
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
index 137b335..9ee5379 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
@@ -80,7 +80,7 @@ public abstract class CayenneRuntime {
/**
* Returns an array of modules used to initialize this runtime.
*
- * @deprecated since 3.2. We only keep one module now, so use
+ * @deprecated since 4.0. We only keep one module now, so use
* {@link #getModule()}.
*/
@Deprecated
@@ -92,7 +92,7 @@ public abstract class CayenneRuntime {
*
* Returns the module used to initialize this runtime.
*
- * @since 3.2
+ * @since 4.0
*/
public Module getModule() {
return module;
@@ -128,7 +128,7 @@ public abstract class CayenneRuntime {
* Returns a new ObjectContext instance based on the runtime's main
* DataChannel.
*
- * @since 3.2
+ * @since 4.0
*/
public ObjectContext newContext() {
return injector.getInstance(ObjectContextFactory.class).createContext();
@@ -139,7 +139,7 @@ public abstract class CayenneRuntime {
* DataChannel. This method is used for creation of nested ObjectContexts,
* with parent ObjectContext passed as an argument.
*
- * @since 3.2
+ * @since 4.0
*/
public ObjectContext newContext(DataChannel parentChannel) {
return injector.getInstance(ObjectContextFactory.class).createContext(parentChannel);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java
index aec6f12..12953e6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/Constants.java
@@ -169,7 +169,7 @@ public interface Constants {
* milliseconds a query must run before is logged. A value less than or
* equal to zero (the default) disables this feature.
*
- * @since 3.2
+ * @since 4.0
* */
public final static String QUERY_EXECUTION_TIME_LOGGING_THRESHOLD_PROPERTY = "cayenne.server.query_execution_time_logging_threshold";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java
index 49d9129..bccce57 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultRuntimeProperties.java
@@ -55,7 +55,7 @@ public class DefaultRuntimeProperties implements RuntimeProperties {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public String get(String key, String defaultValue) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/ModuleCollection.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/ModuleCollection.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/ModuleCollection.java
index d7fcb41..19c2ed5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/ModuleCollection.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/ModuleCollection.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.di.Module;
* A module that decorates a collection of other modules. Used as a helper for
* multi-module runtimes initialization.
*
- * @since 3.2
+ * @since 4.0
*/
public class ModuleCollection implements Module {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
index 32236b9..d798634 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
@@ -34,7 +34,7 @@ public interface RuntimeProperties {
* Returns a String property value for a given key or a default value if a
* value is not present in properties or is null.
*
- * @since 3.2
+ * @since 4.0
*/
String get(String key, String defaultValue);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManager.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManager.java
index 33034f7..a1b9714 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManager.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManager.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.di.ClassLoaderManager;
import org.apache.cayenne.di.Injector;
/**
- * @since 3.2
+ * @since 4.0
*/
public class OsgiClassLoaderManager implements ClassLoaderManager {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java
index c3a961b..fafe4d5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
/**
- * @since 3.2
+ * @since 4.0
*/
// TODO: this is really a hack until we can have fully injectable class loading
// at the EntityResolver level per CAY-1887
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModule.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModule.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModule.java
index 3ac81c6..a163d3e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModule.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModule.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.di.Module;
/**
* A DI module that helps to bootstrap Cayenne in OSGi environment.
*
- * @since 3.2
+ * @since 4.0
*/
public class OsgiModule implements Module {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java
index 3f3982b..481f220 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/osgi/OsgiModuleBuilder.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.Module;
/**
* A builder of a DI module that helps to bootstrap Cayenne in OSGi environment.
*
- * @since 3.2
+ * @since 4.0
*/
public class OsgiModuleBuilder {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
index 92763c1..f1a8d57 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
@@ -56,7 +56,7 @@ import org.apache.commons.logging.LogFactory;
public class DataDomainProvider implements Provider<DataDomain> {
/**
- * @since 3.2
+ * @since 4.0
*/
static final String DEFAULT_NAME = "cayenne";
@@ -165,7 +165,7 @@ public class DataDomainProvider implements Provider<DataDomain> {
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected DataNode addDataNode(DataDomain dataDomain, DataNodeDescriptor nodeDescriptor) throws Exception {
DataNode dataNode = dataNodeFactory.createDataNode(nodeDescriptor);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java
index b7a098c..7221dd0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.configuration.DataNodeDescriptor;
/**
* A factory for creating DataNodes from descriptors.
*
- * @since 3.2
+ * @since 4.0
*/
public interface DataNodeFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java
index be597ae..bd844d4 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.log.JdbcEventLogger;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultDataNodeFactory implements DataNodeFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java
index cacdafb..f7b58de 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java
@@ -23,7 +23,7 @@ import javax.sql.DataSource;
import org.apache.cayenne.configuration.DataNodeDescriptor;
/**
- * @since 3.2
+ * @since 4.0
*/
class FixedDataSourceFactory implements DataSourceFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java
index 8407674..b06618e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.configuration.server;
import org.apache.cayenne.configuration.DataNodeDescriptor;
/**
- * @since 3.2
+ * @since 4.0
*/
class FixedJNDIDataSourceFactory extends JNDIDataSourceFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
index 484bb86..6e4d322 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
@@ -72,7 +72,7 @@ public class ServerRuntime extends CayenneRuntime {
* user code, which most often than not will consist of multiple Cayenne
* operations.
*
- * @since 3.2
+ * @since 4.0
*/
public <T> T performInTransaction(TransactionalOperation<T> op) {
TransactionManager tm = injector.getInstance(TransactionManager.class);
@@ -94,7 +94,7 @@ public class ServerRuntime extends CayenneRuntime {
* Returns a default DataSource for this runtime. If no default DataSource
* exists, an exception is thrown.
*
- * @since 3.2
+ * @since 4.0
*/
public DataSource getDataSource() {
DataDomain domain = getDataDomain();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
index bf0c431..8b0263d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
@@ -36,7 +36,7 @@ import org.apache.cayenne.di.Module;
* configure custom modules, multiple config locations, or quickly create a
* global DataSource.
*
- * @since 3.2
+ * @since 4.0
*/
public class ServerRuntimeBuilder {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/SyntheticNodeDataDomainProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/SyntheticNodeDataDomainProvider.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/SyntheticNodeDataDomainProvider.java
index 4d6d4c2..56751fe 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/SyntheticNodeDataDomainProvider.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/SyntheticNodeDataDomainProvider.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
/**
- * @since 3.2
+ * @since 4.0
*/
class SyntheticNodeDataDomainProvider extends DataDomainProvider {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
index 4fc4a8f..12226a1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
@@ -83,7 +83,7 @@ public class CayenneFilter implements Filter {
/**
* Subclasses may override this to specify additional modules that should be included when creating the CayenneRuntime (in addition to those specified in the web.xml file).
*
- * @since 3.2
+ * @since 4.0
*/
protected Collection<Module> getAdditionalModules() {
return new ArrayList<Module>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/StatelessContextRequestHandler.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/StatelessContextRequestHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/StatelessContextRequestHandler.java
index 004e245..ef54465 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/StatelessContextRequestHandler.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/StatelessContextRequestHandler.java
@@ -50,7 +50,7 @@ public class AppModule implements Module {
}
</code></pre>
*
- * @since 3.2
+ * @since 4.0
*/
public class StatelessContextRequestHandler implements RequestHandler {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java b/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
index 8df2175..da93040 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
@@ -227,7 +227,7 @@ public class DataSourceInfo implements Cloneable, Serializable, XMLSerializable
}
/**
- * @deprecated since 3.2 as class loading should not happen here.
+ * @deprecated since 4.0 as class loading should not happen here.
*/
@Deprecated
public PasswordEncoding getPasswordEncoder() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/conn/DriverDataSource.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/conn/DriverDataSource.java b/cayenne-server/src/main/java/org/apache/cayenne/conn/DriverDataSource.java
index c64a157..0cf9afc 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/conn/DriverDataSource.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/conn/DriverDataSource.java
@@ -52,7 +52,7 @@ public class DriverDataSource implements DataSource {
* Loads JDBC driver using current thread class loader.
*
* @since 3.0
- * @deprecated since 3.2 as class loading should not happen here.
+ * @deprecated since 4.0 as class loading should not happen here.
*/
@Deprecated
private static Driver loadDriver(String driverClassName) throws SQLException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/conn/PoolManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/conn/PoolManager.java b/cayenne-server/src/main/java/org/apache/cayenne/conn/PoolManager.java
index c26e87e..1a71024 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/conn/PoolManager.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/conn/PoolManager.java
@@ -83,7 +83,7 @@ public class PoolManager implements ScopeEventListener, DataSource,
* Creates new PoolManager using org.apache.cayenne.conn.PoolDataSource for an
* underlying ConnectionPoolDataSource.
*
- * @deprecated since 3.2 This constructor causes implicit class loading that should avoided.
+ * @deprecated since 4.0 This constructor causes implicit class loading that should avoided.
*/
@Deprecated
public PoolManager(String jdbcDriver, String dataSourceUrl, int minCons, int maxCons,
@@ -93,7 +93,7 @@ public class PoolManager implements ScopeEventListener, DataSource,
}
/**
- * @deprecated since 3.2 This constructor causes implicit class loading that should avoided.
+ * @deprecated since 4.0 This constructor causes implicit class loading that should avoided.
*/
@Deprecated
public PoolManager(String jdbcDriver, String dataSourceUrl, int minCons, int maxCons,
@@ -128,7 +128,7 @@ public class PoolManager implements ScopeEventListener, DataSource,
* @param maxCons Non-negative integer that specifies maximum number of simultaneuosly
* open connections
* @throws SQLException if pool manager can not be created.
- * @deprecated since 3.2 use {@link #PoolManager(ConnectionPoolDataSource, int, int, String, String, long)}
+ * @deprecated since 4.0 use {@link #PoolManager(ConnectionPoolDataSource, int, int, String, String, long)}
*/
public PoolManager(ConnectionPoolDataSource poolDataSource, int minCons, int maxCons,
String userName, String password) throws SQLException {
@@ -145,7 +145,7 @@ public class PoolManager implements ScopeEventListener, DataSource,
* @param maxCons Non-negative integer that specifies maximum number of simultaneuosly
* open connections
* @throws SQLException if pool manager can not be created.
- * @since 3.2
+ * @since 4.0
*/
public PoolManager(ConnectionPoolDataSource poolDataSource, int minCons, int maxCons,
String userName, String password, long maxQueueWaitTime) throws SQLException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
index 8a99ae0..012a3f0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
@@ -224,7 +224,7 @@ public class AutoAdapter implements DbAdapter {
}
/**
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Deprecated
@Override
@@ -233,7 +233,7 @@ public class AutoAdapter implements DbAdapter {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public QuotingStrategy getQuotingStrategy() {
@@ -241,7 +241,7 @@ public class AutoAdapter implements DbAdapter {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public DbAdapter unwrap() {
@@ -249,7 +249,7 @@ public class AutoAdapter implements DbAdapter {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public EJBQLTranslatorFactory getEjbqlTranslatorFactory() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
index 11f7304..9914974 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
@@ -185,7 +185,7 @@ public interface DbAdapter {
/**
* @since 3.0
- * @deprecated since 3.2 use {@link #getQuotingStrategy()}.
+ * @deprecated since 4.0 use {@link #getQuotingStrategy()}.
*/
@Deprecated
QuotingStrategy getQuotingStrategy(boolean needQuotes);
@@ -193,7 +193,7 @@ public interface DbAdapter {
/**
* Returns SQL identifier quoting strategy object
*
- * @since 3.2
+ * @since 4.0
*/
QuotingStrategy getQuotingStrategy();
@@ -201,14 +201,14 @@ public interface DbAdapter {
* Allows the users to get access to the adapter decorated by a given
* adapter.
*
- * @since 3.2
+ * @since 4.0
*/
DbAdapter unwrap();
/**
* Returns a translator factory for EJBQL to SQL translation.
*
- * @since 3.2
+ * @since 4.0
*/
EJBQLTranslatorFactory getEjbqlTranslatorFactory();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
index 093080b..1019f7b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/DefaultQuotingStrategy.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.Entity;
/**
- * @since 3.2 this is a top-level class.
+ * @since 4.0 this is a top-level class.
*/
public class DefaultQuotingStrategy implements QuotingStrategy {
@@ -38,7 +38,7 @@ public class DefaultQuotingStrategy implements QuotingStrategy {
}
/**
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Override
@Deprecated
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java
index fee695d..e255abf 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcActionBuilder.java
@@ -44,7 +44,7 @@ public class JdbcActionBuilder implements SQLActionVisitor {
protected DataNode dataNode;
/**
- * @since 3.2
+ * @since 4.0
*/
public JdbcActionBuilder(DataNode dataNode) {
this.dataNode = dataNode;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
index 5d6a372..a91126a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
@@ -74,7 +74,7 @@ public class JdbcAdapter implements DbAdapter {
/**
* @since 3.1
- * @deprecated since 3.2 BatchQueryBuilderfactory is attached to the
+ * @deprecated since 4.0 BatchQueryBuilderfactory is attached to the
* DataNode.
*/
@Inject
@@ -244,7 +244,7 @@ public class JdbcAdapter implements DbAdapter {
* Returns true if supplied type can have a length attribute as a part of column
* definition
*
- * @since 3.2
+ * @since 4.0
*/
public boolean typeSupportsLength(int type) {
return JdbcAdapter.supportsLength(type);
@@ -591,7 +591,7 @@ public class JdbcAdapter implements DbAdapter {
}
/**
- * @since 3.2
+ * @since 4.0
* @return
*/
protected QuotingStrategy createQuotingStrategy() {
@@ -600,7 +600,7 @@ public class JdbcAdapter implements DbAdapter {
/**
* @since 3.0
- * @deprecated since 3.2 use {@link #getQuotingStrategy()}.
+ * @deprecated since 4.0 use {@link #getQuotingStrategy()}.
*/
@Deprecated
public QuotingStrategy getQuotingStrategy(boolean needQuotes) {
@@ -608,7 +608,7 @@ public class JdbcAdapter implements DbAdapter {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public QuotingStrategy getQuotingStrategy() {
return quotingStrategy;
@@ -616,7 +616,7 @@ public class JdbcAdapter implements DbAdapter {
/**
* @since 3.1
- * @deprecated since 3.2 BatchQueryBuilderfactory is attached to the
+ * @deprecated since 4.0 BatchQueryBuilderfactory is attached to the
* DataNode.
*/
@Deprecated
@@ -626,7 +626,7 @@ public class JdbcAdapter implements DbAdapter {
/**
* @since 3.1
- * @deprecated since 3.2 BatchQueryBuilderfactory is attached to the
+ * @deprecated since 4.0 BatchQueryBuilderfactory is attached to the
* DataNode.
*/
@Deprecated
@@ -637,7 +637,7 @@ public class JdbcAdapter implements DbAdapter {
/**
* Simply returns this, as JdbcAdapter is not a wrapper.
*
- * @since 3.2
+ * @since 4.0
*/
@Override
public DbAdapter unwrap() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/QuotingStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/QuotingStrategy.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/QuotingStrategy.java
index 285a99c..0b004f5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/QuotingStrategy.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/QuotingStrategy.java
@@ -32,13 +32,13 @@ public interface QuotingStrategy {
/**
* Returns a properly quoted identifier.
*
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Deprecated
String quoteString(String identifier);
/**
- * @deprecated since 3.2 renamed to
+ * @deprecated since 4.0 renamed to
* {@link #quotedFullyQualifiedName(DbEntity)}.
*/
@Deprecated
@@ -50,33 +50,33 @@ public interface QuotingStrategy {
* algorithm. Analog of "quotedIdentifier(entity.getCatalog(),
* entity.getSchema(), entity.getName())".
*
- * @since 3.2
+ * @since 4.0
*/
String quotedFullyQualifiedName(DbEntity entity);
/**
*
- * @since 3.2
+ * @since 4.0
*/
String quotedName(DbAttribute attribute);
/**
- * @since 3.2
+ * @since 4.0
*/
String quotedSourceName(DbJoin join);
/**
- * @since 3.2
+ * @since 4.0
*/
String quotedTargetName(DbJoin join);
/**
- * @since 3.2
+ * @since 4.0
*/
String quotedIdentifier(Entity entity, String... identifierParts);
/**
- * @since 3.2
+ * @since 4.0
*/
String quotedIdentifier(DataMap dataMap, String... identifierParts);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSelectTranslator.java
index d070350..bc89501 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSelectTranslator.java
@@ -33,7 +33,7 @@ class FrontBaseSelectTranslator extends SelectTranslator {
static final String SELECT_PREFIX = "SELECT";
/**
- * @since 3.2
+ * @since 4.0
*/
public FrontBaseSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2PkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2PkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2PkGenerator.java
index a02e1b3..a6264aa 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2PkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2PkGenerator.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.map.DbKeyGenerator;
/**
* Default PK generator for H2 that uses sequences for PK generation.
*
- * @since 3.2
+ * @since 4.0
*/
public class H2PkGenerator extends OraclePkGenerator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectTranslator.java
index fe78462..af11ea5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLSelectTranslator.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.Query;
class HSQLSelectTranslator extends SelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public HSQLSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java
index 15c1a1e..17f8283 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresActionBuilder.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.query.SelectQuery;
public class IngresActionBuilder extends JdbcActionBuilder {
/**
- * @since 3.2
+ * @since 4.0
*/
public IngresActionBuilder(DataNode dataNode) {
super(dataNode);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectTranslator.java
index 67d5f3b..18558ec 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSelectTranslator.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.query.Query;
public class IngresSelectTranslator extends SelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public IngresSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java
index 4f30df5..bd20ef2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSelectTranslator.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.Query;
class MySQLSelectTranslator extends SelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public MySQLSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java
index 0635892..d0dc5a6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSelectTranslator.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.query.Query;
class OpenBaseSelectTranslator extends SelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public OpenBaseSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectTranslator.java
index 7393de0..aa35ada 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SelectTranslator.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.query.Query;
class Oracle8SelectTranslator extends OracleSelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public Oracle8SelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java
index 15ff97f..72aebbf 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleBatchAction.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.BatchQuery;
class OracleBatchAction extends BatchAction {
/**
- * @since 3.2
+ * @since 4.0
*/
OracleBatchAction(BatchQuery batchQuery, DataNode dataNode, boolean runningAsBatch) {
super(batchQuery, dataNode, runningAsBatch);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
index 6612814..911a2c2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
@@ -34,7 +34,7 @@ import org.apache.cayenne.query.Query;
class OracleSelectTranslator extends SelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public OracleSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
index 38beaa5..3344e25 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.query.Query;
class PostgresSelectTranslator extends SelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public PostgresSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java
index 89e56a0..9b3a10c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerActionBuilder.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.query.SelectQuery;
public class SQLServerActionBuilder extends JdbcActionBuilder {
/**
- * @since 3.2
+ * @since 4.0
*/
public SQLServerActionBuilder(DataNode dataNode) {
super(dataNode);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
index d908363..c0afc25 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
@@ -49,7 +49,7 @@ import org.apache.cayenne.query.Query;
public class SQLServerProcedureAction extends ProcedureAction {
/**
- * @since 3.2
+ * @since 4.0
*/
public SQLServerProcedureAction(ProcedureQuery query, DataNode dataNode) {
super(query, dataNode);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectTranslator.java
index b6ecf6a..3556c7b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSelectTranslator.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.query.QueryMetadata;
public class SQLServerSelectTranslator extends SelectTranslator {
/**
- * @since 3.2
+ * @since 4.0
*/
public SQLServerSelectTranslator(Query query, DataNode dataNode, Connection connection) {
super(query, dataNode, connection);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
index 2690704..b272243 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/Expression.java
@@ -141,12 +141,12 @@ public abstract class Expression implements Serializable, XMLSerializable {
public static final int BITWISE_XOR = 42;
/**
- * @since 3.2
+ * @since 4.0
*/
public static final int BITWISE_LEFT_SHIFT = 43;
/**
- * @since 3.2
+ * @since 4.0
*/
public static final int BITWISE_RIGHT_SHIFT = 44;
@@ -157,7 +157,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* a semantically correct expression, an ExpressionException is thrown.
*
* @since 1.1
- * @deprecated since 3.2 use
+ * @deprecated since 4.0 use
* {@link ExpressionFactory#exp(String, Object...)}
*/
@Deprecated
@@ -270,7 +270,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* pruning. If declared and provided parameters counts are mismatched, an
* exception will be thrown.
*
- * @since 3.2
+ * @since 4.0
*/
public Expression paramsArray(Object... parameters) {
Expression clone = deepCopy();
@@ -279,7 +279,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
}
/**
- * @since 3.2
+ * @since 4.0
*/
void inPlaceParamsArray(Object... parameters) {
@@ -298,7 +298,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* Note that if you want matching against nulls to be preserved, you must
* place NULL values for the corresponding keys in the map.
*
- * @since 3.2
+ * @since 4.0
*/
public Expression params(Map<String, ?> parameters) {
return transform(new NamedParamTransformer(parameters, true));
@@ -315,7 +315,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* Note that if you want matching against nulls to be preserved, you must
* place NULL values for the corresponding keys in the map.
*
- * @since 3.2
+ * @since 4.0
*/
public Expression params(Map<String, ?> parameters, boolean pruneMissing) {
return transform(new NamedParamTransformer(parameters, pruneMissing));
@@ -324,7 +324,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
/**
* A shortcut for <code>expWithParams(params, true)</code>.
*
- * @deprecated since 3.2 use {@link #params(Map)}
+ * @deprecated since 4.0 use {@link #params(Map)}
*/
@Deprecated
public Expression expWithParameters(Map<String, ?> parameters) {
@@ -353,7 +353,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* real values, or null if the whole expression was pruned, due to
* the missing parameters.
*
- * @deprecated since 3.2 use {@link #params(Map)} or
+ * @deprecated since 4.0 use {@link #params(Map)} or
* {@link #paramsNoPrune(Map)}.
*/
@Deprecated
@@ -376,7 +376,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* using specified join type. It is very useful for incrementally building
* chained expressions, like long AND or OR statements.
*
- * @since 3.2
+ * @since 4.0
*/
public Expression joinExp(int type, Expression exp,
Expression... expressions) {
@@ -401,7 +401,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
/**
* Chains this expression with other expressions using "and".
*
- * @since 3.2
+ * @since 4.0
*/
public Expression andExp(Expression exp, Expression... expressions) {
return joinExp(Expression.AND, exp, expressions);
@@ -417,7 +417,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
/**
* Chains this expression with other expressions using "or".
*
- * @since 3.2
+ * @since 4.0
*/
public Expression orExp(Expression exp, Expression... expressions) {
return joinExp(Expression.OR, exp, expressions);
@@ -675,7 +675,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* PrintWriter.
*
* @since 1.1
- * @deprecated since 3.2 use {@link #appendAsString(Appendable)}.
+ * @deprecated since 4.0 use {@link #appendAsString(Appendable)}.
*/
@Deprecated
public abstract void encodeAsString(PrintWriter pw);
@@ -683,7 +683,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
/**
* Appends own content as a String to the provided Appendable.
*
- * @since 3.2
+ * @since 4.0
* @throws IOException
*/
public abstract void appendAsString(Appendable out) throws IOException;
@@ -694,7 +694,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* expressions.
*
* @since 3.0
- * @deprecated since 3.2 use {@link #appendAsEJBQL(Appendable, String)}
+ * @deprecated since 4.0 use {@link #appendAsEJBQL(Appendable, String)}
*/
@Deprecated
public abstract void encodeAsEJBQL(PrintWriter pw, String rootId);
@@ -704,7 +704,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* Appendable. DB path expressions produce non-standard EJBQL path
* expressions.
*
- * @since 3.2
+ * @since 4.0
* @throws IOException
*/
public void appendAsEJBQL(Appendable out, String rootId) throws IOException {
@@ -723,7 +723,7 @@ public abstract class Expression implements Serializable, XMLSerializable {
* possible to generate a string-only representation of the Expression in
* EJBQL.
*
- * @since 3.2
+ * @since 4.0
* @throws IOException
*/
public abstract void appendAsEJBQL(List<Object> parameterAccumulator,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java
index c96068d..dc1d815 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/ExpressionFactory.java
@@ -907,28 +907,28 @@ public class ExpressionFactory {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public static Expression and(Collection<Expression> expressions) {
return joinExp(Expression.AND, expressions);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public static Expression and(Expression... expressions) {
return join(Expression.AND, expressions);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public static Expression or(Collection<Expression> expressions) {
return joinExp(Expression.OR, expressions);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public static Expression or(Expression... expressions) {
return join(Expression.OR, expressions);
@@ -942,7 +942,7 @@ public class ExpressionFactory {
* Binding of parameters by name (as opposed to binding by position) can be
* achieved by chaining this call with {@link Expression#params(Map)}.
*
- * @since 3.2
+ * @since 4.0
*/
public static Expression exp(String expressionString, Object... parameters) {
Expression e = fromString(expressionString);
@@ -960,7 +960,7 @@ public class ExpressionFactory {
* Parses string, converting it to Expression. If string does not represent
* a semantically correct expression, an ExpressionException is thrown.
*
- * @since 3.2
+ * @since 4.0
*/
private static Expression fromString(String expressionString) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/Property.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/Property.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/Property.java
index 0929db6..999b346 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/Property.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/Property.java
@@ -44,7 +44,7 @@ import org.apache.cayenne.reflect.PropertyUtils;
*
* @param <E>
* The type this property returns.
- * @since 3.2
+ * @since 4.0
*/
public class Property<E> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
index e1873b3..890e678 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseLeftShift.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.util.ConversionUtil;
/**
* Bitwise left shift '<<' operation.
*
- * @since 3.2
+ * @since 4.0
*/
public class ASTBitwiseLeftShift extends SimpleNode {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
index 3c5f822..8e09f26 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTBitwiseRightShift.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.util.ConversionUtil;
/**
* Bitwise right shift '>>' operation.
*
- * @since 3.2
+ * @since 4.0
*/
public class ASTBitwiseRightShift extends SimpleNode {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
index a82ffc8..d5cc2d7 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTDbPath.java
@@ -90,7 +90,7 @@ public class ASTDbPath extends ASTPath {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
@@ -102,7 +102,7 @@ public class ASTDbPath extends ASTPath {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java
index 25a84ac..e59f9f9 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFalse.java
@@ -70,7 +70,7 @@ public class ASTFalse extends ConditionNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
@@ -78,7 +78,7 @@ public class ASTFalse extends ConditionNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTList.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
index fafeaad..f83b478 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTList.java
@@ -92,7 +92,7 @@ public class ASTList extends SimpleNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java
index e7072b4..d59cf57 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNamedParameter.java
@@ -75,7 +75,7 @@ public class ASTNamedParameter extends ASTScalar {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java
index 8d6101b..21b546b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNegate.java
@@ -67,7 +67,7 @@ public class ASTNegate extends SimpleNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
@@ -92,7 +92,7 @@ public class ASTNegate extends SimpleNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java
index be8fcf8..b12491f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTNot.java
@@ -70,7 +70,7 @@ public class ASTNot extends AggregateConditionNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
@@ -79,7 +79,7 @@ public class ASTNot extends AggregateConditionNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
index f12d419..72f7b91 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
@@ -69,7 +69,7 @@ public class ASTObjPath extends ASTPath {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
@@ -79,7 +79,7 @@ public class ASTObjPath extends ASTPath {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java
index 9efc4e2..fb1f743 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTScalar.java
@@ -67,7 +67,7 @@ public class ASTScalar extends SimpleNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
@@ -75,7 +75,7 @@ public class ASTScalar extends SimpleNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTTrue.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTTrue.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTTrue.java
index 07a92ca..e41cf87 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTTrue.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTTrue.java
@@ -68,7 +68,7 @@ public class ASTTrue extends ConditionNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
@@ -76,7 +76,7 @@ public class ASTTrue extends ConditionNode {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java
index e081ec8..866322b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.util.ConversionUtil;
* Performs argument conversions for a calling binary expression, so that the
* expression could eval the arguments of the same type.
*
- * @since 3.2
+ * @since 4.0
*/
abstract class Evaluator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
index 27a87c5..ca68ded 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
@@ -268,7 +268,7 @@ public abstract class SimpleNode extends Expression implements Node {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsString(Appendable out) throws IOException {
@@ -299,7 +299,7 @@ public abstract class SimpleNode extends Expression implements Node {
}
/**
- * @deprecated since 3.2 use {@link #appendAsString(Appendable)}.
+ * @deprecated since 4.0 use {@link #appendAsString(Appendable)}.
*/
@Override
@Deprecated
@@ -433,7 +433,7 @@ public abstract class SimpleNode extends Expression implements Node {
/**
* @since 3.0
- * @deprecated since 3.2 use {@link #appendAsEJBQL(Appendable, String)}.
+ * @deprecated since 4.0 use {@link #appendAsEJBQL(Appendable, String)}.
*/
@Override
@Deprecated
@@ -446,14 +446,14 @@ public abstract class SimpleNode extends Expression implements Node {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void appendAsEJBQL(Appendable out, String rootId) throws IOException {
appendAsEJBQL(null,out,rootId);
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public void appendAsEJBQL(List<Object> parameterAccumulator, Appendable out, String rootId) throws IOException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
index 7c8c27a..adbc8eb 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
@@ -59,12 +59,12 @@ public interface JdbcEventLogger {
void logQuery(String sql, List<DbAttribute> attrs, List<?> params, long time);
/**
- * @since 3.2
+ * @since 4.0
*/
void logQueryParameters(String label, BatchParameterBinding[] bindings);
/**
- * @deprecated since 3.2 in favor of
+ * @deprecated since 4.0 in favor of
* {@link #logQueryParameters(String, List)}
*/
@Deprecated
@@ -80,7 +80,7 @@ public interface JdbcEventLogger {
* @param sql
* SQL that was executed, printed when time exceeds timeThreshold
*
- * @since 3.2
+ * @since 4.0
*/
void logSelectCount(int count, long time, String sql);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
index 5f1f10c..48c6502 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
@@ -83,7 +83,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
/**
* Defines the name of the property for default DB catalog.
*
- * @since 3.2
+ * @since 4.0
*/
public static final String DEFAULT_CATALOG_PROPERTY = "defaultCatalog";
@@ -148,7 +148,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
private SortedMap<String, SQLResult> results;
/**
- * @deprecated since 3.2 unused as listeners are no longer tied to a
+ * @deprecated since 4.0 unused as listeners are no longer tied to a
* DataMap.
*/
private List<EntityListener> defaultEntityListeners;
@@ -782,7 +782,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
* generic Collection is returned.
*
* @since 3.0
- * @deprecated since 3.2 unused as listeners are no longer tied to a
+ * @deprecated since 4.0 unused as listeners are no longer tied to a
* DataMap.
*/
@Deprecated
@@ -796,7 +796,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
* @since 3.0
* @throws IllegalArgumentException
* if a listener for the same class name is already registered.
- * @deprecated since 3.2 unused as listeners are no longer tied to a
+ * @deprecated since 4.0 unused as listeners are no longer tied to a
* DataMap.
*/
@Deprecated
@@ -814,7 +814,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
* Removes a listener matching class name.
*
* @since 3.0
- * @deprecated since 3.2 unused as listeners are no longer tied to a
+ * @deprecated since 4.0 unused as listeners are no longer tied to a
* DataMap.
*/
@Deprecated
@@ -831,7 +831,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
/**
* @since 3.0
- * @deprecated since 3.2 unused, as listeners are no longer tied to a
+ * @deprecated since 4.0 unused, as listeners are no longer tied to a
* DataMap.
*/
@Deprecated
@@ -1299,21 +1299,21 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
}
/**
- * @since 3.2
+ * @since 4.0
*/
public String getDefaultCatalog() {
return defaultCatalog;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setDefaultCatalog(String defaultCatalog) {
this.defaultCatalog = defaultCatalog;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public EntityInheritanceTree getInheritanceTree(String entityName) {
// TODO: we should support that
@@ -1321,7 +1321,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
}
/**
- * @since 3.2
+ * @since 4.0
*/
public ObjEntity getObjEntity(Class<?> entityClass) {
if (entityClass == null) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/DbRelationship.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DbRelationship.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DbRelationship.java
index e84a5a8..c595f56 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/DbRelationship.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DbRelationship.java
@@ -281,7 +281,7 @@ public class DbRelationship extends Relationship implements ConfigurationNode {
* relationship in any way will not change the underlying table row of the
* source.
*
- * @since 3.2
+ * @since 4.0
*/
public boolean isSourceIndependentFromTargetChange() {
// note - call "isToPK" at the end of the chain, since
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/Embeddable.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/Embeddable.java b/cayenne-server/src/main/java/org/apache/cayenne/map/Embeddable.java
index bf17a2b..744a5cc 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/Embeddable.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/Embeddable.java
@@ -76,7 +76,7 @@ public class Embeddable implements ConfigurationNode, XMLSerializable, Serializa
/**
* Returns Java class of the embeddable.
*
- * @deprecated since 3.2 this method based on statically defined class
+ * @deprecated since 4.0 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.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListener.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListener.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListener.java
index 4b20c89..84e172d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListener.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListener.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.util.XMLSerializable;
* callback methods to be notified of the entity events.
*
* @since 3.0
- * @deprecated since 3.2, as EntityResolver no longer loads listeners from its
+ * @deprecated since 4.0, as EntityResolver no longer loads listeners from its
* DataMaps.
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListenerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListenerFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListenerFactory.java
index 62f6e37..5457967 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListenerFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityListenerFactory.java
@@ -27,7 +27,7 @@ package org.apache.cayenne.map;
* classes).
*
* @since 3.0
- * @deprecated since 3.2, as EntityResolver no longer loads listeners from its
+ * @deprecated since 4.0, as EntityResolver no longer loads listeners from its
* DataMaps.
*/
public interface EntityListenerFactory {
[3/3] git commit: CAY-1965 Change version from 3.2 to 4.0
Posted by aa...@apache.org.
CAY-1965 Change version from 3.2 to 4.0
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/777b1d65
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/777b1d65
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/777b1d65
Branch: refs/heads/master
Commit: 777b1d6501e6a1e54d1afd59be50eb188a05c216
Parents: 0bb7946
Author: aadamchik <aa...@apache.org>
Authored: Sun Nov 2 12:08:54 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Nov 2 12:32:46 2014 +0300
----------------------------------------------------------------------
.../cayenne/crypto/CayenneCryptoException.java | 2 +-
.../apache/cayenne/crypto/CryptoConstants.java | 2 +-
.../cayenne/crypto/CryptoModuleBuilder.java | 2 +-
.../CryptoBatchTranslatorFactoryDecorator.java | 2 +-
.../cayenne/crypto/cipher/CipherFactory.java | 2 +-
.../crypto/cipher/DefaultCipherFactory.java | 2 +-
.../cayenne/crypto/key/JceksKeySource.java | 2 +-
.../apache/cayenne/crypto/map/ColumnMapper.java | 2 +-
.../cayenne/crypto/map/PatternColumnMapper.java | 2 +-
.../crypto/transformer/BindingsTransformer.java | 2 +-
.../transformer/DefaultBindingsTransformer.java | 2 +-
.../transformer/DefaultMapTransformer.java | 2 +-
.../transformer/DefaultTransformerFactory.java | 2 +-
.../crypto/transformer/MapTransformer.java | 2 +-
.../crypto/transformer/TransformerFactory.java | 2 +-
.../transformer/bytes/BytesDecryptor.java | 2 +-
.../transformer/bytes/BytesEncryptor.java | 2 +-
.../bytes/BytesTransformerFactory.java | 2 +-
.../bytes/CbcBytesTransformerFactory.java | 2 +-
.../crypto/transformer/bytes/CbcDecryptor.java | 2 +-
.../crypto/transformer/bytes/CbcEncryptor.java | 2 +-
.../bytes/DefaultBytesTransformerFactory.java | 2 +-
.../crypto/transformer/bytes/GzipDecryptor.java | 2 +-
.../crypto/transformer/bytes/GzipEncryptor.java | 2 +-
.../crypto/transformer/bytes/Header.java | 2 +-
.../transformer/bytes/HeaderDecryptor.java | 2 +-
.../value/Base64StringConverter.java | 2 +-
.../transformer/value/BytesConverter.java | 2 +-
.../value/BytesToBytesConverter.java | 2 +-
.../value/DefaultValueDecryptor.java | 2 +-
.../value/DefaultValueEncryptor.java | 2 +-
.../value/DefaultValueTransformerFactory.java | 2 +-
.../transformer/value/Utf8StringConverter.java | 2 +-
.../transformer/value/ValueDecryptor.java | 2 +-
.../transformer/value/ValueEncryptor.java | 2 +-
.../value/ValueTransformerFactory.java | 2 +-
.../apache/cayenne/di/AdhocObjectFactory.java | 2 +-
.../main/java/org/apache/cayenne/di/Binder.java | 4 +--
.../apache/cayenne/di/ClassLoaderManager.java | 2 +-
.../apache/cayenne/di/DIRuntimeException.java | 2 +-
.../org/apache/cayenne/di/DecoratorBuilder.java | 2 +-
.../ConstructorInjectingDecoratorProvider.java | 2 +-
.../cayenne/di/spi/DecoratorProvider.java | 2 +-
.../di/spi/DefaultAdhocObjectFactory.java | 2 +-
.../di/spi/DefaultClassLoaderManager.java | 2 +-
.../cayenne/di/spi/DefaultDecoratorBuilder.java | 2 +-
.../di/spi/FieldInjectingDecoratorProvider.java | 2 +-
.../cayenne/di/spi/FieldInjectingProvider.java | 2 +-
.../lifecycle/audit/AuditableFilter.java | 2 +-
.../apache/cayenne/lifecycle/id/IdCoder.java | 2 +-
.../java/org/apache/cayenne/BaseContext.java | 6 ++--
.../java/org/apache/cayenne/CayenneContext.java | 2 +-
.../cayenne/CollectionResultIterator.java | 2 +-
.../java/org/apache/cayenne/ObjectContext.java | 8 ++---
.../apache/cayenne/ResultIteratorCallback.java | 2 +-
.../org/apache/cayenne/access/DataContext.java | 6 ++--
.../org/apache/cayenne/access/DataDomain.java | 12 +++----
.../access/DataDomainLegacyQueryAction.java | 2 +-
.../cayenne/access/DataDomainQueryAction.java | 2 +-
.../org/apache/cayenne/access/DataNode.java | 14 ++++----
.../org/apache/cayenne/access/DataPort.java | 2 +-
.../apache/cayenne/access/DataPortDelegate.java | 2 +-
.../java/org/apache/cayenne/access/DbArcId.java | 2 +-
.../org/apache/cayenne/access/DbLoader.java | 14 ++++----
.../cayenne/access/DbLoaderConfiguration.java | 2 +-
.../cayenne/access/DefaultDbLoaderDelegate.java | 2 +-
.../cayenne/access/OperationObserver.java | 2 +-
.../cayenne/access/PrefetchObjectResolver.java | 2 +-
.../org/apache/cayenne/access/Transaction.java | 4 +--
.../cayenne/access/jdbc/BaseSQLAction.java | 2 +-
.../apache/cayenne/access/jdbc/BatchAction.java | 4 +--
.../cayenne/access/jdbc/ColumnDescriptor.java | 4 +--
.../jdbc/ConnectionAwareResultIterator.java | 2 +-
.../access/jdbc/DistinctResultIterator.java | 2 +-
.../cayenne/access/jdbc/JDBCResultIterator.java | 8 ++---
.../access/jdbc/LimitResultIterator.java | 2 +-
.../cayenne/access/jdbc/ProcedureAction.java | 2 +-
.../cayenne/access/jdbc/SQLTemplateAction.java | 2 +-
.../cayenne/access/jdbc/SelectAction.java | 2 +-
.../jdbc/reader/DefaultRowReaderFactory.java | 2 +-
.../access/jdbc/reader/RowReaderFactory.java | 2 +-
.../translator/batch/BatchParameterBinding.java | 2 +-
.../translator/batch/BatchTranslator.java | 2 +-
.../batch/BatchTranslatorFactory.java | 2 +-
.../batch/DefaultBatchTranslator.java | 2 +-
.../batch/DefaultBatchTranslatorFactory.java | 2 +-
.../batch/SoftDeleteTranslatorFactory.java | 2 +-
.../translator/select/QualifierTranslator.java | 4 +--
.../translator/select/QueryAssembler.java | 2 +-
.../translator/select/SelectTranslator.java | 2 +-
.../access/util/DefaultOperationObserver.java | 2 +-
.../apache/cayenne/cache/EhCacheQueryCache.java | 4 +--
.../cayenne/configuration/CayenneRuntime.java | 8 ++---
.../apache/cayenne/configuration/Constants.java | 2 +-
.../configuration/DefaultRuntimeProperties.java | 2 +-
.../cayenne/configuration/ModuleCollection.java | 2 +-
.../configuration/RuntimeProperties.java | 2 +-
.../osgi/OsgiClassLoaderManager.java | 2 +-
.../osgi/OsgiDataDomainProvider.java | 2 +-
.../cayenne/configuration/osgi/OsgiModule.java | 2 +-
.../configuration/osgi/OsgiModuleBuilder.java | 2 +-
.../server/DataDomainProvider.java | 4 +--
.../configuration/server/DataNodeFactory.java | 2 +-
.../server/DefaultDataNodeFactory.java | 2 +-
.../server/FixedDataSourceFactory.java | 2 +-
.../server/FixedJNDIDataSourceFactory.java | 2 +-
.../configuration/server/ServerRuntime.java | 4 +--
.../server/ServerRuntimeBuilder.java | 2 +-
.../server/SyntheticNodeDataDomainProvider.java | 2 +-
.../configuration/web/CayenneFilter.java | 2 +-
.../web/StatelessContextRequestHandler.java | 2 +-
.../org/apache/cayenne/conn/DataSourceInfo.java | 2 +-
.../apache/cayenne/conn/DriverDataSource.java | 2 +-
.../org/apache/cayenne/conn/PoolManager.java | 8 ++---
.../org/apache/cayenne/dba/AutoAdapter.java | 8 ++---
.../java/org/apache/cayenne/dba/DbAdapter.java | 8 ++---
.../cayenne/dba/DefaultQuotingStrategy.java | 4 +--
.../apache/cayenne/dba/JdbcActionBuilder.java | 2 +-
.../org/apache/cayenne/dba/JdbcAdapter.java | 16 ++++-----
.../org/apache/cayenne/dba/QuotingStrategy.java | 16 ++++-----
.../frontbase/FrontBaseSelectTranslator.java | 2 +-
.../apache/cayenne/dba/h2/H2PkGenerator.java | 2 +-
.../dba/hsqldb/HSQLSelectTranslator.java | 2 +-
.../cayenne/dba/ingres/IngresActionBuilder.java | 2 +-
.../dba/ingres/IngresSelectTranslator.java | 2 +-
.../dba/mysql/MySQLSelectTranslator.java | 2 +-
.../dba/openbase/OpenBaseSelectTranslator.java | 2 +-
.../dba/oracle/Oracle8SelectTranslator.java | 2 +-
.../cayenne/dba/oracle/OracleBatchAction.java | 2 +-
.../dba/oracle/OracleSelectTranslator.java | 2 +-
.../dba/postgres/PostgresSelectTranslator.java | 2 +-
.../dba/sqlserver/SQLServerActionBuilder.java | 2 +-
.../dba/sqlserver/SQLServerProcedureAction.java | 2 +-
.../sqlserver/SQLServerSelectTranslator.java | 2 +-
.../java/org/apache/cayenne/exp/Expression.java | 34 ++++++++++----------
.../apache/cayenne/exp/ExpressionFactory.java | 12 +++----
.../java/org/apache/cayenne/exp/Property.java | 2 +-
.../cayenne/exp/parser/ASTBitwiseLeftShift.java | 2 +-
.../exp/parser/ASTBitwiseRightShift.java | 2 +-
.../apache/cayenne/exp/parser/ASTDbPath.java | 4 +--
.../org/apache/cayenne/exp/parser/ASTFalse.java | 4 +--
.../org/apache/cayenne/exp/parser/ASTList.java | 2 +-
.../cayenne/exp/parser/ASTNamedParameter.java | 2 +-
.../apache/cayenne/exp/parser/ASTNegate.java | 4 +--
.../org/apache/cayenne/exp/parser/ASTNot.java | 4 +--
.../apache/cayenne/exp/parser/ASTObjPath.java | 4 +--
.../apache/cayenne/exp/parser/ASTScalar.java | 4 +--
.../org/apache/cayenne/exp/parser/ASTTrue.java | 4 +--
.../apache/cayenne/exp/parser/Evaluator.java | 2 +-
.../apache/cayenne/exp/parser/SimpleNode.java | 10 +++---
.../org/apache/cayenne/log/JdbcEventLogger.java | 6 ++--
.../java/org/apache/cayenne/map/DataMap.java | 20 ++++++------
.../org/apache/cayenne/map/DbRelationship.java | 2 +-
.../java/org/apache/cayenne/map/Embeddable.java | 2 +-
.../org/apache/cayenne/map/EntityListener.java | 2 +-
.../cayenne/map/EntityListenerFactory.java | 2 +-
.../org/apache/cayenne/map/EntityResolver.java | 32 +++++++++---------
.../org/apache/cayenne/map/MappingCache.java | 2 +-
.../apache/cayenne/map/MappingNamespace.java | 10 +++---
.../java/org/apache/cayenne/map/ObjEntity.java | 22 ++++++-------
.../map/naming/DefaultUniqueNameGenerator.java | 2 +-
.../apache/cayenne/map/naming/NameChecker.java | 2 +-
.../apache/cayenne/map/naming/NameCheckers.java | 2 +-
.../cayenne/map/naming/ObjectNameGenerator.java | 2 +-
.../cayenne/map/naming/UniqueNameGenerator.java | 2 +-
.../org/apache/cayenne/query/BatchQuery.java | 8 ++---
.../org/apache/cayenne/query/BatchQueryRow.java | 2 +-
.../org/apache/cayenne/query/EJBQLQuery.java | 4 +--
.../apache/cayenne/query/ProcedureQuery.java | 4 +--
.../org/apache/cayenne/query/QueryRouter.java | 2 +-
.../org/apache/cayenne/query/SQLSelect.java | 4 +--
.../org/apache/cayenne/query/SQLTemplate.java | 10 +++---
.../org/apache/cayenne/query/SelectById.java | 4 +--
.../org/apache/cayenne/query/SelectQuery.java | 22 ++++++-------
.../org/apache/cayenne/reflect/ArcProperty.java | 2 +-
.../cayenne/reflect/ConverterFactory.java | 2 +-
.../reflect/LifecycleCallbackRegistry.java | 4 +--
.../cayenne/reflect/PropertyDescriptor.java | 2 +-
.../apache/cayenne/remote/RemoteSession.java | 6 ++--
.../resource/ClassLoaderResourceLocator.java | 2 +-
.../org/apache/cayenne/tx/BaseTransaction.java | 2 +-
.../apache/cayenne/tx/CayenneTransaction.java | 2 +-
.../cayenne/tx/DefaultTransactionFactory.java | 2 +-
.../cayenne/tx/DefaultTransactionManager.java | 2 +-
.../apache/cayenne/tx/ExternalTransaction.java | 2 +-
.../java/org/apache/cayenne/tx/Transaction.java | 2 +-
.../apache/cayenne/tx/TransactionFactory.java | 2 +-
.../apache/cayenne/tx/TransactionManager.java | 2 +-
.../cayenne/tx/TransactionalOperation.java | 2 +-
.../apache/cayenne/util/EntityMergeSupport.java | 8 ++---
.../main/java/org/apache/cayenne/util/Util.java | 2 +-
.../exp/Expression_ParamsLegacyTest.java | 2 +-
.../apache/cayenne/merge/TokensReversTest.java | 2 +-
.../cayenne/merge/TokensToModelExecution.java | 2 +-
.../apache/cayenne/merge/builders/Builder.java | 2 +-
.../cayenne/merge/builders/DataMapBuilder.java | 2 +-
.../merge/builders/DbAttributeBuilder.java | 2 +-
.../cayenne/merge/builders/DbEntityBuilder.java | 2 +-
.../merge/builders/DbRelationshipBuilder.java | 2 +-
.../cayenne/merge/builders/DefaultBuilder.java | 2 +-
.../merge/builders/ObjAttributeBuilder.java | 2 +-
.../merge/builders/ObjEntityBuilder.java | 2 +-
.../cayenne/merge/builders/ObjectMother.java | 2 +-
.../map/naming/DefaultNameGenerator.java | 2 +-
.../cayenne/tools/AntDataPortDelegate.java | 2 +-
.../org/apache/cayenne/tools/DataPortTask.java | 2 +-
.../apache/cayenne/tools/DbImporterTask.java | 22 ++++++-------
.../configuration/DriverDataSourceFactory.java | 2 +-
.../tools/configuration/ToolsModule.java | 2 +-
.../cayenne/tools/dbimport/DbImportAction.java | 2 +-
.../tools/dbimport/DbImportConfiguration.java | 2 +-
.../dbimport/DbImportDbLoaderDelegate.java | 2 +-
.../cayenne/tools/dbimport/DbImportModule.java | 2 +-
.../cayenne/modeler/ProjectController.java | 4 +--
.../apache/cayenne/wocompat/EOModelHelper.java | 2 +-
.../cayenne/wocompat/EOModelProcessor.java | 8 ++---
.../apache/cayenne/tools/DbImporterMojo.java | 12 +++----
217 files changed, 397 insertions(+), 397 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
index 4a49934..10a8263 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CayenneCryptoException.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto;
import org.apache.cayenne.CayenneRuntimeException;
/**
- * @since 3.2
+ * @since 4.0
*/
public class CayenneCryptoException extends CayenneRuntimeException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
index 9a35cc2..f24934e 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoConstants.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto;
import org.apache.cayenne.crypto.key.KeySource;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface CryptoConstants {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
index 251be8f..5839afe 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
@@ -48,7 +48,7 @@ import org.apache.cayenne.di.Module;
* to specify custom ciphers, as well as a strategy for discovering which
* columns are encrypted.
*
- * @since 3.2
+ * @since 4.0
*/
public class CryptoModuleBuilder {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
index 5d6fda1..cbb19f2 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.query.BatchQuery;
import org.apache.cayenne.query.BatchQueryRow;
/**
- * @since 3.2
+ * @since 4.0
*/
public class CryptoBatchTranslatorFactoryDecorator implements BatchTranslatorFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
index 992bae6..84711c6 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/CipherFactory.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.cipher;
import javax.crypto.Cipher;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface CipherFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
index 127f130..c5aae90 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactory.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.di.Inject;
* Creates and returns a new {@link Cipher} configured using properties from
* {@link CryptoConstants#PROPERTIES_MAP}.
*
- * @since 3.2
+ * @since 4.0
*/
public class DefaultCipherFactory implements CipherFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
index 0e08e8a..5a4c10e 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/key/JceksKeySource.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.di.Inject;
* {@link CryptoConstants#KEYSTORE_URL} to locate the keystore and
* {@link CryptoConstants#KEY_PASSWORD} to read the secret key.
*
- * @since 3.2
+ * @since 4.0
*/
public class JceksKeySource implements KeySource {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
index a673666..df2b51c 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/ColumnMapper.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.map;
import org.apache.cayenne.map.DbAttribute;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface ColumnMapper {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
index 6e2395b..18dcb39 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/PatternColumnMapper.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.DbAttribute;
* matching its name against a preset pattern. Only column name is inspected.
* Table name is ignored.
*
- * @since 3.2
+ * @since 4.0
*/
public class PatternColumnMapper implements ColumnMapper {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
index 4e85b3c..2d782ee 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer;
import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface BindingsTransformer {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
index c54f551..0ef8caf 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.crypto.transformer.bytes.BytesEncryptor;
import org.apache.cayenne.crypto.transformer.value.ValueEncryptor;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultBindingsTransformer implements BindingsTransformer {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
index b4c0cac..b62377a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultMapTransformer.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.crypto.transformer.bytes.BytesDecryptor;
import org.apache.cayenne.crypto.transformer.value.ValueDecryptor;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultMapTransformer implements MapTransformer {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
index 7b37104..3b3e73a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DbAttribute;
/**
- * @since 3.2
+ * @since 4.0
*/
public class DefaultTransformerFactory implements TransformerFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
index 6d62d85..1befbc3 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/MapTransformer.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer;
import java.util.Map;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface MapTransformer {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
index cdf01ee..0d6ed2b 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
* A factory that creates encryption transformers used for processing batch
* bindings and decryption transformers - for result rows.
*
- * @since 3.2
+ * @since 4.0
*/
public interface TransformerFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
index 74ccefc..4ff0b51 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesDecryptor.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.bytes;
import java.security.Key;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface BytesDecryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
index 7f444a2..4bd39c0 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesEncryptor.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.crypto.transformer.bytes;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface BytesEncryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
index 77687bc..fc1ac72 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/BytesTransformerFactory.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.crypto.transformer.bytes;
* A class that encapsulates Cayenne cryptography protocol, which is usually
* dependent on the encryption mode.
*
- * @since 3.2
+ * @since 4.0
*/
public interface BytesTransformerFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
index c8fc2f3..bc38a51 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.crypto.cipher.CipherFactory;
import org.apache.cayenne.crypto.key.KeySource;
/**
- * @since 3.2
+ * @since 4.0
*/
class CbcBytesTransformerFactory implements BytesTransformerFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
index da7f126..6605724 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcDecryptor.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.crypto.CayenneCryptoException;
* by the complimentary {@link CbcEncryptor}. The object is stateful and is not
* thread-safe.
*
- * @since 3.2
+ * @since 4.0
*/
class CbcDecryptor implements BytesDecryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
index 0665963..bebe84b 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcEncryptor.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.crypto.CayenneCryptoException;
* It will be needed for decryption. The object is stateful and is not
* thread-safe.
*
- * @since 3.2
+ * @since 4.0
*/
class CbcEncryptor implements BytesEncryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
index 08692d6..7a26a2a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DefaultBytesTransformerFactory.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.di.Inject;
* A {@link BytesTransformerFactory} that creates transformers depending on the
* encryption mode specified via properties.
*
- * @since 3.2
+ * @since 4.0
*/
public class DefaultBytesTransformerFactory implements BytesTransformerFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
index 5eb6825..7f3b8cb 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipDecryptor.java
@@ -27,7 +27,7 @@ import java.util.zip.GZIPInputStream;
import org.apache.cayenne.crypto.CayenneCryptoException;
/**
- * @since 3.2
+ * @since 4.0
*/
class GzipDecryptor implements BytesDecryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
index c84cae4..1936c52 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/GzipEncryptor.java
@@ -25,7 +25,7 @@ import java.util.zip.GZIPOutputStream;
import org.apache.cayenne.crypto.CayenneCryptoException;
/**
- * @since 3.2
+ * @since 4.0
*/
class GzipEncryptor implements BytesEncryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
index 4f2cc60..a2baa76 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/Header.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.crypto.CayenneCryptoException;
* <li>byte 5..N: UTF8-encoded symbolic name of the encryption key.
* </ul>
*
- * @since 3.2
+ * @since 4.0
*/
public class Header {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
index 5481124..072fd82 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
@@ -23,7 +23,7 @@ import java.security.Key;
import org.apache.cayenne.crypto.key.KeySource;
/**
- * @since 3.2
+ * @since 4.0
*/
class HeaderDecryptor implements BytesDecryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
index ca8a571..3d36a3a 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Base64StringConverter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
import javax.xml.bind.DatatypeConverter;
/**
- * @since 3.2
+ * @since 4.0
*/
class Base64StringConverter implements BytesConverter {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
index bacab4c..d6b75f6 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesConverter.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.crypto.transformer.value;
/**
- * @since 3.2
+ * @since 4.0
*/
interface BytesConverter {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
index f721522..74f919c 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/BytesToBytesConverter.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.crypto.transformer.value;
/**
- * @since 3.2
+ * @since 4.0
*/
class BytesToBytesConverter implements BytesConverter {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
index 5e065f3..09f0849 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueDecryptor.java
@@ -23,7 +23,7 @@ import java.security.Key;
import org.apache.cayenne.crypto.transformer.bytes.BytesDecryptor;
/**
- * @since 3.2
+ * @since 4.0
*/
class DefaultValueDecryptor implements ValueDecryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
index b1a2818..e451db1 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueEncryptor.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
import org.apache.cayenne.crypto.transformer.bytes.BytesEncryptor;
/**
- * @since 3.2
+ * @since 4.0
*/
class DefaultValueEncryptor implements ValueEncryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
index 8f82532..6fa56d7 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.map.ObjEntity;
* A {@link ValueTransformerFactory} that creates encryptors/decryptors that are
* taking advantage of the JCE (Java Cryptography Extension) ciphers.
*
- * @since 3.2
+ * @since 4.0
*/
public class DefaultValueTransformerFactory implements ValueTransformerFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
index a754f4f..b9cddb7 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/Utf8StringConverter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
import java.nio.charset.Charset;
/**
- * @since 3.2
+ * @since 4.0
*/
final class Utf8StringConverter implements BytesConverter {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
index 4549d64..2912f70 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueDecryptor.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
import org.apache.cayenne.crypto.transformer.bytes.BytesDecryptor;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface ValueDecryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
index e87135d..cae9738 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueEncryptor.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.crypto.transformer.bytes.BytesEncryptor;
/**
* An encryptor or decryptor of a single value.
*
- * @since 3.2
+ * @since 4.0
*/
public interface ValueEncryptor {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
index 3599316..9e789a3 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/ValueTransformerFactory.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.map.DbAttribute;
* A factory that creates transformers for encryption/decryption of individual
* values.
*
- * @since 3.2
+ * @since 4.0
*/
public interface ValueTransformerFactory {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java b/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
index cd10770..7d8e3df 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
@@ -36,7 +36,7 @@ public interface AdhocObjectFactory {
* Returns a Java class loaded using ClassLoader returned from
* {@link ClassLoaderManager#getClassLoader(String)} for a given class name.
*
- * @since 3.2
+ * @since 4.0
*/
Class<?> getJavaClass(String className);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java b/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
index 54b15dc..d002cc1 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/Binder.java
@@ -60,12 +60,12 @@ public interface Binder {
<T> ListBuilder<T> bindList(String bindingName);
/**
- * @since 3.2
+ * @since 4.0
*/
<T> DecoratorBuilder<T> decorate(Class<T> interfaceType);
/**
- * @since 3.2
+ * @since 4.0
*/
<T> DecoratorBuilder<T> decorate(Key<T> key);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java b/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
index 5434388..1f26e86 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
@@ -23,7 +23,7 @@ package org.apache.cayenne.di;
* between environments. E.g. between JEE with thread/hierarchical classloaders
* and OSGi with per-bundle classloaders.
*
- * @since 3.2
+ * @since 4.0
*/
public interface ClassLoaderManager {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java b/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
index e828b0f..076b496 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.di;
/**
* A runtime exception thrown on DI misconfiguration.
*
- * @since 3.2
+ * @since 4.0
*/
public class DIRuntimeException extends RuntimeException {
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java b/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
index 8a26a03..6572149 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/DecoratorBuilder.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.di;
/**
- * @since 3.2
+ * @since 4.0
*/
public interface DecoratorBuilder<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
index 0889454..4ad974f 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorInjectingDecoratorProvider.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
- * @since 3.2
+ * @since 4.0
*/
public class ConstructorInjectingDecoratorProvider<T> implements DecoratorProvider<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
index 5e17132..8559f34 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DecoratorProvider.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
- * @since 3.2
+ * @since 4.0
*/
interface DecoratorProvider<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
index 83d588e..ab2728d 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
@@ -38,7 +38,7 @@ public class DefaultAdhocObjectFactory implements AdhocObjectFactory {
protected ClassLoaderManager classLoaderManager;
/**
- * @since 3.2
+ * @since 4.0
*/
public DefaultAdhocObjectFactory(@Inject Injector injector, @Inject ClassLoaderManager classLoaderManager) {
this.injector = injector;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
index 497ad24..483bbb2 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.di.ClassLoaderManager;
/**
* A {@link ClassLoaderManager} that
*
- * @since 3.2
+ * @since 4.0
*/
public class DefaultClassLoaderManager implements ClassLoaderManager {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
index 3ba654d..1c0a0b4 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultDecoratorBuilder.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.di.DecoratorBuilder;
import org.apache.cayenne.di.Key;
/**
- * @since 3.2
+ * @since 4.0
*/
class DefaultDecoratorBuilder<T> implements DecoratorBuilder<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
index 0e5015e..e6c072b 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingDecoratorProvider.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Provider;
/**
- * @since 3.2
+ * @since 4.0
*/
class FieldInjectingDecoratorProvider<T> implements DecoratorProvider<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
index 96ff905..edc55be 100644
--- a/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
+++ b/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
@@ -78,7 +78,7 @@ class FieldInjectingProvider<T> implements Provider<T> {
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected Object value(Field field, String bindingName) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
index 931d9c4..58b0feb 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
@@ -53,7 +53,7 @@ public class AuditableFilter implements DataChannelFilter {
protected EntityResolver entityResolver;
/**
- * @since 3.2
+ * @since 4.0
*/
public AuditableFilter(AuditableProcessor processor) {
this.processor = processor;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
index d89f31c..63d0e01 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/IdCoder.java
@@ -53,7 +53,7 @@ public class IdCoder {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public String getStringId(ObjectId id) {
EntityIdCoder coder = getCoder(id.getEntityName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java b/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
index fc0ad33..dd61318 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/BaseContext.java
@@ -299,7 +299,7 @@ public abstract class BaseContext implements ObjectContext {
public abstract List performQuery(Query query);
/**
- * @since 3.2
+ * @since 4.0
*/
@SuppressWarnings("unchecked")
@Override
@@ -308,7 +308,7 @@ public abstract class BaseContext implements ObjectContext {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public <T> T selectOne(Select<T> query) {
@@ -324,7 +324,7 @@ public abstract class BaseContext implements ObjectContext {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public <T> void iterate(Select<T> query, ResultIteratorCallback<T> callback) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java b/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
index 4ae5b34..827a60f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CayenneContext.java
@@ -380,7 +380,7 @@ public class CayenneContext extends BaseContext {
* This method simply returns an iterator over a list of selected objects.
* There's no performance benefit of using it vs. regular "select".
*
- * @since 3.2
+ * @since 4.0
*/
public <T> ResultIterator<T> iterator(org.apache.cayenne.query.Select<T> query) {
List<T> objects = select(query);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
index e77543b..9556b15 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
@@ -26,7 +26,7 @@ import java.util.List;
/**
* A ResultIterator over a collection of objects.
*
- * @since 3.2
+ * @since 4.0
*/
class CollectionResultIterator<T> implements ResultIterator<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java b/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
index 7bdd67f..a925bdd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ObjectContext.java
@@ -180,7 +180,7 @@ public interface ObjectContext extends DataChannel, Serializable {
* Executes a selecting query, returning a list of persistent objects or
* data rows.
*
- * @since 3.2
+ * @since 4.0
*/
<T> List<T> select(Select<T> query);
@@ -189,7 +189,7 @@ public interface ObjectContext extends DataChannel, Serializable {
* objects, or a single object. If query matches more than one object,
* {@link CayenneRuntimeException} is thrown.
*
- * @since 3.2
+ * @since 4.0
*/
<T> T selectOne(Select<T> query);
@@ -198,7 +198,7 @@ public interface ObjectContext extends DataChannel, Serializable {
* callback for processing. The caller does not need to worry about closing
* the iterator. This method takes care of it.
*
- * @since 3.2
+ * @since 4.0
*/
<T> void iterate(Select<T> query, ResultIteratorCallback<T> callback);
@@ -209,7 +209,7 @@ public interface ObjectContext extends DataChannel, Serializable {
* iteration in try/finally and close the ResultIterator explicitly. Or use
* {@link #iterate(Select, ResultIteratorCallback)} as an alternative.
*
- * @since 3.2
+ * @since 4.0
*/
<T> ResultIterator<T> iterator(Select<T> query);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java b/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
index 216489f..d27c609 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ResultIteratorCallback.java
@@ -22,7 +22,7 @@ package org.apache.cayenne;
* A callback interface invoked on each row when iterating over
* {@link ResultIterator}. This simplifies iterator management.
*
- * @since 3.2
+ * @since 4.0
*/
public interface ResultIteratorCallback<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
index bda8892..0fdab21 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
@@ -83,7 +83,7 @@ public class DataContext extends BaseContext {
protected ObjectStore objectStore;
/**
- * @deprecated since 3.2 used in a method that itself should be deprecated,
+ * @deprecated since 4.0 used in a method that itself should be deprecated,
* so this is a temp code
*/
@Deprecated
@@ -1205,8 +1205,8 @@ public class DataContext extends BaseContext {
}
/**
- * @since 3.2
- * @deprecated since 3.2 avoid using thsi directly. Transaction management
+ * @since 4.0
+ * @deprecated since 4.0 avoid using thsi directly. Transaction management
* at this level will be eventually removed
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
index b77fee0..e8ba6ff 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
@@ -69,13 +69,13 @@ public class DataDomain implements QueryEngine, DataChannel {
public static final boolean VALIDATING_OBJECTS_ON_COMMIT_DEFAULT = true;
/**
- * @deprecated since 3.2 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
+ * @deprecated since 4.0 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
*/
@Deprecated
public static final String USING_EXTERNAL_TRANSACTIONS_PROPERTY = "cayenne.DataDomain.usingExternalTransactions";
/**
- * @deprecated since 3.2 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
+ * @deprecated since 4.0 See {@link Constants#SERVER_EXTERNAL_TX_PROPERTY}.
*/
@Deprecated
public static final boolean USING_EXTERNAL_TRANSACTIONS_DEFAULT = false;
@@ -87,7 +87,7 @@ public class DataDomain implements QueryEngine, DataChannel {
protected JdbcEventLogger jdbcEventLogger;
/**
- * @since 3.2
+ * @since 4.0
*/
@Inject
protected TransactionManager transactionManager;
@@ -144,7 +144,7 @@ public class DataDomain implements QueryEngine, DataChannel {
* Configuration object.
* @param properties
* A Map containing domain configuration properties.
- * @deprecated since 3.2 unused
+ * @deprecated since 4.0 unused
*/
@Deprecated
public DataDomain(String name, Map properties) {
@@ -207,7 +207,7 @@ public class DataDomain implements QueryEngine, DataChannel {
* Reinitializes domain state with a new set of properties.
*
* @since 1.1
- * @deprecated since 3.2 properties are processed by the DI provider.
+ * @deprecated since 4.0 properties are processed by the DI provider.
*/
@Deprecated
public void initWithProperties(Map<String, String> properties) {
@@ -714,7 +714,7 @@ public class DataDomain implements QueryEngine, DataChannel {
* is a shortcut for
* 'getEntityResolver().getCallbackRegistry().addListener(listener)'.
*
- * @since 3.2
+ * @since 4.0
*/
public void addListener(Object listener) {
getEntityResolver().getCallbackRegistry().addListener(listener);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
index a98c30f..3c3c46e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
@@ -127,7 +127,7 @@ class DataDomainLegacyQueryAction implements QueryRouter, OperationObserver {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public QueryEngine engineForName(String name) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
index 3854e89..a0fce92 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
@@ -517,7 +517,7 @@ class DataDomainQueryAction implements QueryRouter, OperationObserver {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public QueryEngine engineForName(String name) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
index 55a8f19..907c81a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
@@ -454,7 +454,7 @@ public class DataNode implements QueryEngine {
/**
* Creates a {@link RowReader} using internal {@link RowReaderFactory}.
*
- * @since 3.2
+ * @since 4.0
*/
public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata) {
return rowReader(descriptor, queryMetadata, Collections.<ObjAttribute, ColumnDescriptor> emptyMap());
@@ -463,7 +463,7 @@ public class DataNode implements QueryEngine {
/**
* Creates a {@link RowReader} using internal {@link RowReaderFactory}.
*
- * @since 3.2
+ * @since 4.0
*/
public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata,
Map<ObjAttribute, ColumnDescriptor> attributeOverrides) {
@@ -471,35 +471,35 @@ public class DataNode implements QueryEngine {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public BatchTranslator batchTranslator(BatchQuery query, String trimFunction) {
return batchTranslatorFactory.translator(query, getAdapter(), trimFunction);
}
/**
- * @since 3.2
+ * @since 4.0
*/
public RowReaderFactory getRowReaderFactory() {
return rowReaderFactory;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setRowReaderFactory(RowReaderFactory rowReaderFactory) {
this.rowReaderFactory = rowReaderFactory;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public BatchTranslatorFactory getBatchTranslatorFactory() {
return batchTranslatorFactory;
}
/**
- * @since 3.2
+ * @since 4.0
*/
public void setBatchTranslatorFactory(BatchTranslatorFactory batchTranslatorFactory) {
this.batchTranslatorFactory = batchTranslatorFactory;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
index 5173f7d..3ec8b63 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPort.java
@@ -54,7 +54,7 @@ import org.apache.cayenne.query.SelectQuery;
*
* @since 1.2: Prior to 1.2 DataPort classes were a part of cayenne-examples
* package.
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Deprecated
public class DataPort {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
index 5c57df8..199031b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataPortDelegate.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.query.Query;
* delegate methods during different stages of porting process.
*
* @since 1.2: Prior to 1.2 DataPort classes were a part of cayenne-examples package.
- * @deprecated since 3.2
+ * @deprecated since 4.0
*/
@Deprecated
public interface DataPortDelegate {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
index 510f7ee..4d66101 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbArcId.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.util.HashCodeBuilder;
* DbEntities of flattened attributes or relationships. Provides 'equals' and
* 'hashCode' implementations adequate for use as a map key.
*
- * @since 3.2
+ * @since 4.0
*/
final class DbArcId {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
index 4f8fdee..c8589e0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
@@ -538,7 +538,7 @@ public class DbLoader {
}
/**
- * @since 3.2
+ * @since 4.0
*/
protected EntityMergeSupport createEntityMerger(DataMap map) {
return new EntityMergeSupport(map, nameGenerator, !creatingMeaningfulPK);
@@ -734,7 +734,7 @@ public class DbLoader {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public String[] getDefaultTableTypes() {
String viewType = adapter.tableTypeForView();
@@ -760,7 +760,7 @@ public class DbLoader {
* tables and views.
*
* @since 1.0.7
- * @deprecated since 3.2 use
+ * @deprecated since 4.0 use
* {@link #load(DataMap, String, String, String, String...)}
* method that supports catalogs.
*/
@@ -781,7 +781,7 @@ public class DbLoader {
* contains default mapping of the tables and views. Allows to limit types
* of tables to read.
*
- * @deprecated since 3.2 use
+ * @deprecated since 4.0 use
* {@link #load(DataMap, String, String, String, String...)}
* method that supports catalogs.
*/
@@ -799,7 +799,7 @@ public class DbLoader {
* schema, table name and table type patterns and fills the specified
* DataMap object with DB and object mapping info.
*
- * @since 3.2
+ * @since 4.0
*/
public void load(DataMap dataMap, String catalogPattern, String schemaPattern, String tablePattern,
String... tableTypes) throws SQLException {
@@ -829,7 +829,7 @@ public class DbLoader {
* </p>
*
* @since 1.1
- * @deprecated since 3.2 use
+ * @deprecated since 4.0 use
* {@link #loadProcedures(DataMap, String, String, String)} that
* supports "catalog" pattern.
*/
@@ -846,7 +846,7 @@ public class DbLoader {
* be invoked explicitly by the user. </i>
* </p>
*
- * @since 3.2
+ * @since 4.0
*/
public void loadProcedures(DataMap dataMap, String catalogPattern, String schemaPattern, String namePattern)
throws SQLException {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
index 9d56964..02dab76 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoaderConfiguration.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.access;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class DbLoaderConfiguration {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
index 08e229e..807635a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DefaultDbLoaderDelegate.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
/**
- * @since 3.2.
+ * @since 4.0.
*/
public class DefaultDbLoaderDelegate implements DbLoaderDelegate {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java b/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
index 682af9c..7f292d2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/OperationObserver.java
@@ -61,7 +61,7 @@ public interface OperationObserver extends OperationHints {
* Callback method invoked after each batch of generated values is read during an
* update.
*
- * @since 3.2
+ * @since 4.0
*/
void nextGeneratedRows(Query query, ResultIterator keys, ObjectId idToUpdate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
index 4843fcf..e54c017 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/PrefetchObjectResolver.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.Persistent;
import org.apache.cayenne.reflect.ClassDescriptor;
/**
- * @since 3.2
+ * @since 4.0
*/
class PrefetchObjectResolver extends ObjectResolver {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
index 80c3f55..779ba34 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/Transaction.java
@@ -22,10 +22,10 @@ import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.tx.BaseTransaction;
/**
- * @deprecated since 3.2. For manual transaction management use
+ * @deprecated since 4.0. For manual transaction management use
* {@link BaseTransaction} static methods or better -
* {@link ServerRuntime#performInTransaction(org.apache.cayenne.tx.TransactionalOperation)}
- * . Also note that since 3.2 an actual Transaction is an interface
+ * . Also note that since 4.0 an actual Transaction is an interface
* located in a different package:
* {@link org.apache.cayenne.tx.Transaction}
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
index 38a1f61..7dcb056 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
@@ -40,7 +40,7 @@ public abstract class BaseSQLAction implements SQLAction {
protected DataNode dataNode;
/**
- * @since 3.2
+ * @since 4.0
*/
public BaseSQLAction(DataNode dataNode) {
this.dataNode = dataNode;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
index 25bea65..7efe4e3 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
@@ -65,7 +65,7 @@ public class BatchAction extends BaseSQLAction {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public BatchAction(BatchQuery query, DataNode dataNode, boolean runningAsBatch) {
super(dataNode);
@@ -224,7 +224,7 @@ public class BatchAction extends BaseSQLAction {
/**
* Implements generated keys extraction supported in JDBC 3.0 specification.
*
- * @since 3.2
+ * @since 4.0
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
protected void processGeneratedKeys(Statement statement, OperationObserver observer, BatchQueryRow row)
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
index d93d4d8..3f3f189 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
@@ -142,7 +142,7 @@ public class ColumnDescriptor {
* initialized in a context where a DbAttribite is unknown, this method may
* return null.
*
- * @since 3.2
+ * @since 4.0
*/
public DbAttribute getAttribute() {
return attribute;
@@ -213,7 +213,7 @@ public class ColumnDescriptor {
}
/**
- * @since 3.2
+ * @since 4.0
*/
public String getNamePrefix() {
return namePrefix;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
index 58e64bc..b821d8e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ConnectionAwareResultIterator.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.ResultIterator;
* Subclasses are used in iterators that are returned to the end users and are
* not implicitly managed by Cayenne.
*
- * @since 3.2
+ * @since 4.0
*/
public class ConnectionAwareResultIterator<T> implements ResultIterator<T> {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
index d68b979..6e07506 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
@@ -74,7 +74,7 @@ public class DistinctResultIterator<T> implements ResultIterator<T> {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public Iterator<T> iterator() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
index 7801b43..a5c494f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
@@ -50,7 +50,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
/**
* Creates new JDBCResultIterator that reads from provided ResultSet.
*
- * @since 3.2
+ * @since 4.0
*/
public JDBCResultIterator(Statement statement, ResultSet resultSet, RowReader<T> rowReader) {
@@ -62,7 +62,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public Iterator<T> iterator() {
@@ -167,7 +167,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
}
/**
- * @deprecated since 3.2 always returns false. Connection closing is outside
+ * @deprecated since 4.0 always returns false. Connection closing is outside
* the scope of this iterator. See
* {@link ConnectionAwareResultIterator} for a replacement.
*/
@@ -179,7 +179,7 @@ public class JDBCResultIterator<T> implements ResultIterator<T> {
/**
* Sets the <code>closingConnection</code> property.
*
- * @deprecated since 3.2 does nothing. Connection closing is outside the
+ * @deprecated since 4.0 does nothing. Connection closing is outside the
* scope of this iterator. See
* {@link ConnectionAwareResultIterator} for a replacement.
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
index 186ffcb..e0d5503 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
@@ -56,7 +56,7 @@ public class LimitResultIterator<T> implements ResultIterator<T> {
}
/**
- * @since 3.2
+ * @since 4.0
*/
@Override
public Iterator<T> iterator() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
index c1ea24d..d1068ea 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
@@ -53,7 +53,7 @@ public class ProcedureAction extends BaseSQLAction {
protected int processedResultSets;
/**
- * @since 3.2
+ * @since 4.0
*/
public ProcedureAction(ProcedureQuery query, DataNode dataNode) {
super(dataNode);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/777b1d65/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
index a573409..5f7b773 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
@@ -66,7 +66,7 @@ public class SQLTemplateAction implements SQLAction {
protected DbAdapter dbAdapter;
/**
- * @since 3.2
+ * @since 4.0
*/
public SQLTemplateAction(SQLTemplate query, DataNode dataNode) {
this.query = query;