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 {
