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;
