This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 811226b15440d663b2d952a854cf40a263ec79db Author: Andrus Adamchik <[email protected]> AuthorDate: Fri Jul 3 17:03:22 2026 -0400 translator package reorg --- .../main/java/org/apache/cayenne/crypto/CryptoModule.java | 2 +- .../apache/cayenne/crypto/batch/CryptoBatchTranslator.java | 4 ++-- .../cayenne/dbsync/reverse/configuration/ToolsModule.java | 2 +- .../java/org/apache/cayenne/velocity/VelocityModule.java | 2 +- .../cayenne/velocity/VelocitySQLTemplateTranslator.java | 4 ++-- .../cayenne/velocity/VelocitySQLTemplateTranslatorTest.java | 2 +- .../velocity/VelocitySQLTemplateTranslator_ChainTest.java | 2 +- .../velocity/VelocitySQLTemplateTranslator_SelectTest.java | 2 +- .../src/main/java/org/apache/cayenne/access/DataNode.java | 10 +++++----- .../java/org/apache/cayenne/access/jdbc/BatchAction.java | 2 +- .../java/org/apache/cayenne/access/jdbc/EJBQLAction.java | 2 +- .../java/org/apache/cayenne/access/jdbc/ProcedureAction.java | 12 ++++-------- .../org/apache/cayenne/access/jdbc/SQLTemplateAction.java | 2 +- .../java/org/apache/cayenne/access/jdbc/SelectAction.java | 2 +- .../access/translator/{batch => }/BatchTranslator.java | 2 +- .../access/translator/{ejbql => }/EJBQLTranslator.java | 4 +++- .../translator/{procedure => }/ProcedureTranslator.java | 2 +- .../translator/{sqltemplate => }/SQLTemplateTranslator.java | 2 +- .../access/translator/{select => }/SelectTranslator.java | 2 +- .../access/translator/{batch => }/TranslatedBatch.java | 2 +- .../translator/{procedure => }/TranslatedProcedure.java | 2 +- .../access/translator/{sqltemplate => }/TranslatedSQL.java | 2 +- .../access/translator/{select => }/TranslatedSelect.java | 2 +- .../cayenne/access/translator/batch/BaseBatchTranslator.java | 2 ++ .../translator/ejbql/DbAdapterDelegatedEJBQLTranslator.java | 1 + .../access/translator/ejbql/EJBQLTranslationContext.java | 1 + .../cayenne/access/translator/ejbql/JdbcEJBQLTranslator.java | 1 + .../procedure/DbAdapterDelegatedProcedureTranslator.java | 2 ++ .../translator/procedure/DefaultProcedureTranslator.java | 2 ++ .../select/DbAdapterDelegatedSelectTranslator.java | 2 ++ .../access/translator/select/DefaultSelectTranslator.java | 2 ++ .../cayenne/access/translator/select/PrefetchNodeStage.java | 1 + .../access/translator/select/SelectTranslatorContext.java | 1 + .../translator/sqltemplate/DefaultSQLTemplateTranslator.java | 2 ++ .../org/apache/cayenne/configuration/runtime/CoreModule.java | 10 +++++----- .../configuration/runtime/DefaultDataNodeFactory.java | 10 +++++----- .../src/main/java/org/apache/cayenne/dba/AutoAdapter.java | 6 +++--- cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java | 6 +++--- .../src/main/java/org/apache/cayenne/dba/JdbcAdapter.java | 6 +++--- .../src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java | 2 +- .../java/org/apache/cayenne/dba/db2/DB2ProcedureAction.java | 2 +- .../main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java | 2 +- .../org/apache/cayenne/dba/firebird/FirebirdAdapter.java | 2 +- .../cayenne/dba/frontbase/FrontBaseTemplateAction.java | 2 +- .../src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java | 2 +- .../java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java | 4 ++-- .../main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java | 4 ++-- .../org/apache/cayenne/dba/mysql/MySQLProcedureAction.java | 2 +- .../java/org/apache/cayenne/dba/oracle/OracleAdapter.java | 2 +- .../apache/cayenne/dba/oracle/OracleSQLTemplateAction.java | 2 +- .../org/apache/cayenne/dba/postgres/PostgresAdapter.java | 2 +- .../apache/cayenne/dba/postgres/PostgresSelectAction.java | 2 +- .../apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java | 2 +- .../org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java | 2 +- .../cayenne/dba/sqlserver/SQLServerProcedureAction.java | 2 +- .../java/org/apache/cayenne/dba/sybase/SybaseAdapter.java | 2 +- .../src/test/java/org/apache/cayenne/access/Cay2641IT.java | 2 +- .../cayenne/access/DataContextFlattenedAttributesIT.java | 2 +- .../org/apache/cayenne/access/jdbc/BatchActionLockingIT.java | 2 +- .../select/DbAdapterDelegatedSelectTranslatorIT.java | 1 + .../translator/select/DefaultObjectSelectTranslatorIT.java | 1 + .../sqltemplate/DefaultSQLTemplateTranslatorTest.java | 1 + .../configuration/runtime/DataDomainProviderTest.java | 10 +++++----- .../configuration/runtime/DefaultDbAdapterFactoryTest.java | 2 +- 64 files changed, 101 insertions(+), 83 deletions(-) diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModule.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModule.java index d8beb738a..e4a63ffae 100644 --- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModule.java +++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModule.java @@ -19,7 +19,7 @@ package org.apache.cayenne.crypto; import org.apache.cayenne.access.jdbc.reader.RowReaderFactory; -import org.apache.cayenne.access.translator.batch.BatchTranslator; +import org.apache.cayenne.access.translator.BatchTranslator; import org.apache.cayenne.configuration.DataMapLoader; import org.apache.cayenne.crypto.batch.CryptoBatchTranslator; import org.apache.cayenne.di.Key; diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslator.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslator.java index 60d7c490f..bb9a2dc14 100644 --- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslator.java +++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslator.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.cayenne.crypto.batch; -import org.apache.cayenne.access.translator.batch.BatchTranslator; -import org.apache.cayenne.access.translator.batch.TranslatedBatch; +import org.apache.cayenne.access.translator.BatchTranslator; +import org.apache.cayenne.access.translator.TranslatedBatch; import org.apache.cayenne.crypto.transformer.BindingsTransformer; import org.apache.cayenne.crypto.transformer.TransformerFactory; import org.apache.cayenne.dba.DbAdapter; diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java index 80e2e0386..599f553c9 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java @@ -25,7 +25,7 @@ import org.apache.cayenne.access.flush.operation.DbRowOpSorter; import org.apache.cayenne.access.flush.operation.DefaultDbRowOpSorter; import org.apache.cayenne.access.flush.operation.HardDeleteDbRowOpFactory; import org.apache.cayenne.access.flush.operation.DeleteDbRowOpFactory; -import org.apache.cayenne.access.translator.batch.BatchTranslator; +import org.apache.cayenne.access.translator.BatchTranslator; import org.apache.cayenne.access.translator.batch.DeleteBatchTranslator; import org.apache.cayenne.access.translator.batch.InsertBatchTranslator; import org.apache.cayenne.access.translator.batch.UpdateBatchTranslator; diff --git a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModule.java b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModule.java index ede433bed..23b028880 100644 --- a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModule.java +++ b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModule.java @@ -19,7 +19,7 @@ package org.apache.cayenne.velocity; -import org.apache.cayenne.access.translator.sqltemplate.SQLTemplateTranslator; +import org.apache.cayenne.access.translator.SQLTemplateTranslator; import org.apache.cayenne.di.Binder; import org.apache.cayenne.di.Module; diff --git a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java index a020d69c1..9a968771e 100644 --- a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java +++ b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java @@ -21,8 +21,8 @@ package org.apache.cayenne.velocity; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.jdbc.RSColumn; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; -import org.apache.cayenne.access.translator.sqltemplate.SQLTemplateTranslator; +import org.apache.cayenne.access.translator.TranslatedSQL; +import org.apache.cayenne.access.translator.SQLTemplateTranslator; import org.apache.cayenne.access.jdbc.PSParameter; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.exp.ExpressionException; diff --git a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslatorTest.java b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslatorTest.java index 37c41afad..360ae734e 100644 --- a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslatorTest.java +++ b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslatorTest.java @@ -34,7 +34,7 @@ import java.util.Map; import org.apache.cayenne.GenericPersistentObject; import org.apache.cayenne.ObjectId; import org.apache.cayenne.Persistent; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.access.jdbc.PSParameter; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.dba.DbAdapter; diff --git a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_ChainTest.java b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_ChainTest.java index 2a8284ff8..77f1b8675 100644 --- a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_ChainTest.java +++ b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_ChainTest.java @@ -28,7 +28,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.dba.DbAdapter; import org.junit.jupiter.api.BeforeEach; diff --git a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_SelectTest.java b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_SelectTest.java index d12bc077b..14e196923 100644 --- a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_SelectTest.java +++ b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator_SelectTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; import java.util.Collections; import org.apache.cayenne.access.jdbc.RSColumn; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.dba.DbAdapter; import org.junit.jupiter.api.BeforeEach; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java index 6f496b821..33a800787 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java @@ -22,11 +22,11 @@ package org.apache.cayenne.access; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy; import org.apache.cayenne.access.jdbc.reader.RowReaderFactory; -import org.apache.cayenne.access.translator.batch.BatchTranslator; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; -import org.apache.cayenne.access.translator.select.SelectTranslator; -import org.apache.cayenne.access.translator.sqltemplate.SQLTemplateTranslator; +import org.apache.cayenne.access.translator.BatchTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; +import org.apache.cayenne.access.translator.SelectTranslator; +import org.apache.cayenne.access.translator.SQLTemplateTranslator; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.dba.JdbcAdapter; import org.apache.cayenne.log.JdbcEventLogger; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java index a2b2b4f14..7033ef3c4 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java @@ -28,7 +28,7 @@ import org.apache.cayenne.access.OptimisticLockException; import org.apache.cayenne.access.jdbc.reader.RowReader; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeMap; -import org.apache.cayenne.access.translator.batch.TranslatedBatch; +import org.apache.cayenne.access.translator.TranslatedBatch; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.map.DbAttribute; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java index 79434f9ed..ae7770caa 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java @@ -21,7 +21,7 @@ package org.apache.cayenne.access.jdbc; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.dba.QuotingStrategy; import org.apache.cayenne.ejbql.EJBQLBaseVisitor; import org.apache.cayenne.ejbql.EJBQLCompiledExpression; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java index 22ad8c1e5..85d97e97d 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java @@ -23,7 +23,7 @@ import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.DataRow; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; -import org.apache.cayenne.access.translator.procedure.TranslatedProcedure; +import org.apache.cayenne.access.translator.TranslatedProcedure; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.dba.DbAdapter; @@ -80,16 +80,12 @@ public class ProcedureAction extends BaseSQLAction { bindParameters(statement, translated); // stored procedure may contain a mixture of update counts and - // result sets, - // and out parameters. Read out parameters first, then + // result sets, and out parameters. Read out parameters first, then // iterate until we exhaust all results // TODO: andrus, 4/2/2007 - according to the docs we should store - // the boolean - // return value of this method and avoid calling 'getMoreResults' if - // it is - // true. - // some db's handle this well, some don't (MySQL). + // the boolean return value of this method and avoid calling 'getMoreResults' if + // it is true. some db's handle this well, some don't (MySQL). // 09/23/2013: almost all adapters except Oracle (and maybe a few // more?) are actually using the correct strategy, so making it a diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java index e9d50d11d..18a37a014 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java @@ -24,7 +24,7 @@ import org.apache.cayenne.ResultIterator; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.jdbc.reader.RowReader; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.dba.DbAdapter; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java index fc55a967f..a09141196 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java @@ -23,7 +23,7 @@ import org.apache.cayenne.ResultIterator; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.jdbc.reader.RowReader; -import org.apache.cayenne.access.translator.select.TranslatedSelect; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.query.PrefetchProcessor; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/BatchTranslator.java similarity index 97% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/BatchTranslator.java index d6150c1b0..e27e00cb0 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/BatchTranslator.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.batch; +package org.apache.cayenne.access.translator; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.query.BatchQuery; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/EJBQLTranslator.java similarity index 92% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslator.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/EJBQLTranslator.java index ce8a02888..d8dc54cc5 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/EJBQLTranslator.java @@ -16,8 +16,10 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.ejbql; +package org.apache.cayenne.access.translator; +import org.apache.cayenne.access.translator.ejbql.EJBQLJoinAppender; +import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext; import org.apache.cayenne.ejbql.EJBQLExpressionVisitor; /** diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ProcedureTranslator.java similarity index 96% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/ProcedureTranslator.java index de8b32ba7..e48d8a8b5 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/ProcedureTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/ProcedureTranslator.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.procedure; +package org.apache.cayenne.access.translator; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.map.EntityResolver; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/SQLTemplateTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/SQLTemplateTranslator.java similarity index 96% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/SQLTemplateTranslator.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/SQLTemplateTranslator.java index 3ee3cd1e4..868034657 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/SQLTemplateTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/SQLTemplateTranslator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.sqltemplate; +package org.apache.cayenne.access.translator; import org.apache.cayenne.dba.DbAdapter; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/SelectTranslator.java similarity index 96% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/SelectTranslator.java index 95638683a..8b895dc71 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/SelectTranslator.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.select; +package org.apache.cayenne.access.translator; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.map.EntityResolver; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/TranslatedBatch.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedBatch.java similarity index 96% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/batch/TranslatedBatch.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedBatch.java index 02125d30b..7b671181d 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/TranslatedBatch.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedBatch.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.batch; +package org.apache.cayenne.access.translator; import org.apache.cayenne.access.jdbc.PSBatchParameter; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/TranslatedProcedure.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedProcedure.java similarity index 95% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/TranslatedProcedure.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedProcedure.java index 1aca953c2..ba69136e9 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/TranslatedProcedure.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedProcedure.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.procedure; +package org.apache.cayenne.access.translator; import org.apache.cayenne.access.jdbc.CSParameter; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedSQL.java similarity index 95% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedSQL.java index 68f5f8076..7fae71573 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedSQL.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.sqltemplate; +package org.apache.cayenne.access.translator; import org.apache.cayenne.access.jdbc.RSColumn; import org.apache.cayenne.access.jdbc.PSParameter; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatedSelect.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedSelect.java similarity index 96% rename from cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatedSelect.java rename to cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedSelect.java index 31f3cb9d8..5584e1124 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatedSelect.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/TranslatedSelect.java @@ -17,7 +17,7 @@ * under the License. ****************************************************************/ -package org.apache.cayenne.access.translator.select; +package org.apache.cayenne.access.translator; import org.apache.cayenne.access.jdbc.RSColumn; import org.apache.cayenne.access.jdbc.PSParameter; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/BaseBatchTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/BaseBatchTranslator.java index 0e6b84d07..3fac805ee 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/BaseBatchTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/batch/BaseBatchTranslator.java @@ -27,6 +27,8 @@ import org.apache.cayenne.access.sqlbuilder.SQLGenerationVisitor; import org.apache.cayenne.access.sqlbuilder.DefaultSQLAppendable; import org.apache.cayenne.access.sqlbuilder.sqltree.Node; import org.apache.cayenne.access.jdbc.PSParameter; +import org.apache.cayenne.access.translator.BatchTranslator; +import org.apache.cayenne.access.translator.TranslatedBatch; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.query.BatchQuery; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/DbAdapterDelegatedEJBQLTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/DbAdapterDelegatedEJBQLTranslator.java index e53e641aa..0d045b23e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/DbAdapterDelegatedEJBQLTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/DbAdapterDelegatedEJBQLTranslator.java @@ -19,6 +19,7 @@ package org.apache.cayenne.access.translator.ejbql; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.ejbql.EJBQLExpressionVisitor; /** diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java index 95438a156..cb2bf8e61 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.cayenne.access.translator.ejbql; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.dba.QuotingStrategy; import org.apache.cayenne.ejbql.EJBQLCompiledExpression; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslator.java index cc6eecc0f..fa8544511 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslator.java @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.cayenne.access.translator.ejbql; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.ejbql.EJBQLExpressionVisitor; /** diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DbAdapterDelegatedProcedureTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DbAdapterDelegatedProcedureTranslator.java index ca32a8603..4d1ad1773 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DbAdapterDelegatedProcedureTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DbAdapterDelegatedProcedureTranslator.java @@ -19,6 +19,8 @@ package org.apache.cayenne.access.translator.procedure; +import org.apache.cayenne.access.translator.ProcedureTranslator; +import org.apache.cayenne.access.translator.TranslatedProcedure; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.query.ProcedureQuery; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java index 86743164f..4c8ede6b3 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java @@ -20,6 +20,8 @@ package org.apache.cayenne.access.translator.procedure; import org.apache.cayenne.access.jdbc.CSParameter; +import org.apache.cayenne.access.translator.ProcedureTranslator; +import org.apache.cayenne.access.translator.TranslatedProcedure; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.map.EntityResolver; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslator.java index 6b5d9f2d4..3dc8159f0 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslator.java @@ -19,6 +19,8 @@ package org.apache.cayenne.access.translator.select; +import org.apache.cayenne.access.translator.SelectTranslator; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.query.Select; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java index 45ed8aaa7..932aae46a 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java @@ -20,6 +20,8 @@ package org.apache.cayenne.access.translator.select; import org.apache.cayenne.CayenneRuntimeException; +import org.apache.cayenne.access.translator.SelectTranslator; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.query.FluentSelect; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/PrefetchNodeStage.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/PrefetchNodeStage.java index 1c0766d7b..3717d68ae 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/PrefetchNodeStage.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/PrefetchNodeStage.java @@ -21,6 +21,7 @@ package org.apache.cayenne.access.translator.select; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.sqlbuilder.sqltree.Node; +import org.apache.cayenne.access.translator.SelectTranslator; import org.apache.cayenne.exp.parser.ASTPath; import org.apache.cayenne.exp.path.CayennePath; import org.apache.cayenne.exp.Expression; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java index 1806f6224..2e2c9bdba 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java @@ -25,6 +25,7 @@ import org.apache.cayenne.access.sqlbuilder.SQLGenerationContext; import org.apache.cayenne.access.sqlbuilder.SelectBuilder; import org.apache.cayenne.access.sqlbuilder.sqltree.Node; import org.apache.cayenne.access.jdbc.PSParameter; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.exp.parser.ASTAggregateFunctionCall; import org.apache.cayenne.exp.path.CayennePath; diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java index ae393c99d..69f76aafd 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java @@ -20,6 +20,8 @@ package org.apache.cayenne.access.translator.sqltemplate; import org.apache.cayenne.CayenneRuntimeException; +import org.apache.cayenne.access.translator.SQLTemplateTranslator; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.di.Inject; import org.apache.cayenne.access.translator.sqltemplate.parser.Node; diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java index 4a561aba8..16c4977f9 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java @@ -37,19 +37,19 @@ import org.apache.cayenne.access.flush.operation.DbRowOpSorter; import org.apache.cayenne.access.flush.operation.DefaultDbRowOpSorter; import org.apache.cayenne.access.flush.operation.HardDeleteDbRowOpFactory; import org.apache.cayenne.access.flush.operation.DeleteDbRowOpFactory; -import org.apache.cayenne.access.translator.sqltemplate.SQLTemplateTranslator; +import org.apache.cayenne.access.translator.SQLTemplateTranslator; import org.apache.cayenne.access.jdbc.reader.DefaultRowReaderFactory; import org.apache.cayenne.access.jdbc.reader.RowReaderFactory; -import org.apache.cayenne.access.translator.batch.BatchTranslator; +import org.apache.cayenne.access.translator.BatchTranslator; import org.apache.cayenne.access.translator.batch.DeleteBatchTranslator; import org.apache.cayenne.access.translator.batch.InsertBatchTranslator; import org.apache.cayenne.access.translator.batch.UpdateBatchTranslator; import org.apache.cayenne.access.translator.ejbql.DbAdapterDelegatedEJBQLTranslator; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.procedure.DbAdapterDelegatedProcedureTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; import org.apache.cayenne.access.translator.select.DbAdapterDelegatedSelectTranslator; -import org.apache.cayenne.access.translator.select.SelectTranslator; +import org.apache.cayenne.access.translator.SelectTranslator; import org.apache.cayenne.access.types.*; import org.apache.cayenne.ashwood.AshwoodEntitySorter; import org.apache.cayenne.cache.MapQueryCacheProvider; diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java index 3ba714037..be8f2a93a 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java @@ -20,12 +20,12 @@ package org.apache.cayenne.configuration.runtime; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.dbsync.SchemaUpdateStrategyFactory; -import org.apache.cayenne.access.translator.sqltemplate.SQLTemplateTranslator; +import org.apache.cayenne.access.translator.SQLTemplateTranslator; import org.apache.cayenne.access.jdbc.reader.RowReaderFactory; -import org.apache.cayenne.access.translator.batch.BatchTranslator; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; -import org.apache.cayenne.access.translator.select.SelectTranslator; +import org.apache.cayenne.access.translator.BatchTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; +import org.apache.cayenne.access.translator.SelectTranslator; import org.apache.cayenne.query.DeleteBatchQuery; import org.apache.cayenne.query.InsertBatchQuery; import org.apache.cayenne.query.UpdateBatchQuery; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java index 1c32d5c8b..dbf4f2e1f 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java @@ -24,9 +24,9 @@ import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; import org.apache.cayenne.access.jdbc.CSParameter; import org.apache.cayenne.access.jdbc.PSParameter; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; -import org.apache.cayenne.access.translator.select.SelectTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; +import org.apache.cayenne.access.translator.SelectTranslator; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.di.Provider; import org.apache.cayenne.log.JdbcEventLogger; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java index e81f4ed08..fbf139d93 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java @@ -23,9 +23,9 @@ import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; import org.apache.cayenne.access.jdbc.CSParameter; import org.apache.cayenne.access.jdbc.PSParameter; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; -import org.apache.cayenne.access.translator.select.SelectTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; +import org.apache.cayenne.access.translator.SelectTranslator; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java index cb55bb985..ed0342789 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java @@ -24,12 +24,12 @@ import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; import org.apache.cayenne.access.jdbc.CSParameter; import org.apache.cayenne.access.jdbc.PSParameter; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslator; import org.apache.cayenne.access.translator.procedure.DefaultProcedureTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; import org.apache.cayenne.access.translator.select.DefaultSelectTranslator; -import org.apache.cayenne.access.translator.select.SelectTranslator; +import org.apache.cayenne.access.translator.SelectTranslator; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeFactory; import org.apache.cayenne.access.types.ExtendedTypeMap; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java index 8907a52af..be43f14e0 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java @@ -22,7 +22,7 @@ package org.apache.cayenne.dba.db2; import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslator; import org.apache.cayenne.access.types.BooleanType; import org.apache.cayenne.access.types.ByteArrayType; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2ProcedureAction.java b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2ProcedureAction.java index 4792dc12f..a486200bc 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2ProcedureAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2ProcedureAction.java @@ -22,7 +22,7 @@ import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.jdbc.ProcedureAction; import org.apache.cayenne.access.jdbc.RSColumn; -import org.apache.cayenne.access.translator.procedure.TranslatedProcedure; +import org.apache.cayenne.access.translator.TranslatedProcedure; import org.apache.cayenne.query.ProcedureQuery; import java.sql.CallableStatement; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java index ce7122d88..4de7657c5 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java @@ -21,7 +21,7 @@ package org.apache.cayenne.dba.derby; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslator; import org.apache.cayenne.access.types.ByteType; import org.apache.cayenne.access.types.CharType; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java index 9a46b682a..6665db95c 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java @@ -22,7 +22,7 @@ package org.apache.cayenne.dba.firebird; import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.types.ByteArrayType; import org.apache.cayenne.access.types.CharType; import org.apache.cayenne.access.types.ExtendedType; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseTemplateAction.java b/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseTemplateAction.java index 99d1f41b8..444a1b056 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseTemplateAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseTemplateAction.java @@ -21,7 +21,7 @@ package org.apache.cayenne.dba.frontbase; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.access.jdbc.SQLTemplateAction; import org.apache.cayenne.query.SQLTemplate; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java index 657a4dc31..d98e5d3de 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java @@ -22,7 +22,7 @@ package org.apache.cayenne.dba.h2; import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslator; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeFactory; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java index a28e18469..cbcf9c779 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java @@ -23,9 +23,9 @@ import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; import org.apache.cayenne.access.types.CharType; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeFactory; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java index f7e7c3c4a..0b602abd4 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java @@ -22,9 +22,9 @@ package org.apache.cayenne.dba.mysql; import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; import org.apache.cayenne.access.types.ByteArrayType; import org.apache.cayenne.access.types.CharType; import org.apache.cayenne.access.types.DateType; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java index 91841872f..b9efebe90 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLProcedureAction.java @@ -22,7 +22,7 @@ import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.jdbc.ProcedureAction; import org.apache.cayenne.access.jdbc.RSColumn; -import org.apache.cayenne.access.translator.procedure.TranslatedProcedure; +import org.apache.cayenne.access.translator.TranslatedProcedure; import org.apache.cayenne.query.ProcedureQuery; import java.sql.CallableStatement; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java index c3463f403..c55d39d6e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java @@ -23,7 +23,7 @@ import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.types.ByteType; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeFactory; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java index e301a0784..e7c7cd520 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java @@ -21,7 +21,7 @@ package org.apache.cayenne.dba.oracle; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.jdbc.SQLTemplateAction; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.query.SQLTemplate; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java index f8e33f039..81bc6e561 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java @@ -23,7 +23,7 @@ import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; import org.apache.cayenne.access.types.CharType; import org.apache.cayenne.access.types.ExtendedType; import org.apache.cayenne.access.types.ExtendedTypeFactory; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java index 8b375f314..2d44484b3 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectAction.java @@ -23,7 +23,7 @@ import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.jdbc.RSColumn; import org.apache.cayenne.access.jdbc.SelectAction; import org.apache.cayenne.access.jdbc.PSParameter; -import org.apache.cayenne.access.translator.select.TranslatedSelect; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.query.Select; import java.sql.Connection; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java b/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java index e9024a442..d1a77c894 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java @@ -20,7 +20,7 @@ package org.apache.cayenne.dba.sqlite; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; -import org.apache.cayenne.access.translator.sqltemplate.TranslatedSQL; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.access.jdbc.SQLTemplateAction; import org.apache.cayenne.query.SQLTemplate; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java index a40391166..26541db6f 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java @@ -23,7 +23,7 @@ import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.types.ByteArrayType; import org.apache.cayenne.access.types.ByteType; import org.apache.cayenne.access.types.CharType; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java index 0af3bb37d..931b22f2e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java @@ -25,7 +25,7 @@ import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.access.jdbc.ProcedureAction; import org.apache.cayenne.access.jdbc.RSColumn; -import org.apache.cayenne.access.translator.procedure.TranslatedProcedure; +import org.apache.cayenne.access.translator.TranslatedProcedure; import org.apache.cayenne.query.ProcedureQuery; import org.apache.cayenne.query.Query; diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java index 8720855e3..16f366748 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java @@ -21,7 +21,7 @@ package org.apache.cayenne.dba.sybase; import org.apache.cayenne.dba.NativeColumnType; import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.types.ByteArrayType; import org.apache.cayenne.access.types.ByteType; import org.apache.cayenne.access.types.CharType; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java b/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java index 700d54098..fca827034 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/Cay2641IT.java @@ -20,7 +20,7 @@ package org.apache.cayenne.access; import org.apache.cayenne.Fault; import org.apache.cayenne.access.translator.select.DbAdapterDelegatedSelectTranslator; -import org.apache.cayenne.access.translator.select.TranslatedSelect; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.query.ColumnSelect; import org.apache.cayenne.query.ObjectSelect; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java index 9be97a971..9a3f95725 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java @@ -23,7 +23,7 @@ import org.apache.cayenne.Cayenne; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.PersistenceState; import org.apache.cayenne.access.translator.select.DbAdapterDelegatedSelectTranslator; -import org.apache.cayenne.access.translator.select.TranslatedSelect; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.map.DefaultEntityResultSegment; import org.apache.cayenne.query.ColumnSelect; import org.apache.cayenne.query.EJBQLQuery; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java index 5ecf042d6..05f16f236 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java @@ -24,7 +24,7 @@ import org.apache.cayenne.access.MockOperationObserver; import org.apache.cayenne.access.OptimisticLockException; import org.apache.cayenne.access.jdbc.reader.RowReaderFactory; import org.apache.cayenne.access.translator.batch.DeleteBatchTranslator; -import org.apache.cayenne.access.translator.batch.TranslatedBatch; +import org.apache.cayenne.access.translator.TranslatedBatch; import org.apache.cayenne.dba.JdbcAdapter; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslatorIT.java index dc4acd87b..2171dd298 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslatorIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DbAdapterDelegatedSelectTranslatorIT.java @@ -20,6 +20,7 @@ package org.apache.cayenne.access.translator.select; import org.apache.cayenne.access.jdbc.RSColumn; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.exp.ExpressionException; import org.apache.cayenne.exp.ExpressionFactory; import org.apache.cayenne.map.DbAttribute; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java index 8e705bf0b..8294a431f 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/DefaultObjectSelectTranslatorIT.java @@ -19,6 +19,7 @@ package org.apache.cayenne.access.translator.select; +import org.apache.cayenne.access.translator.TranslatedSelect; import org.apache.cayenne.query.ObjectSelect; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslatorTest.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslatorTest.java index f47286e94..fa06a0f8e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslatorTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslatorTest.java @@ -29,6 +29,7 @@ import org.apache.cayenne.GenericPersistentObject; import org.apache.cayenne.ObjectId; import org.apache.cayenne.Persistent; import org.apache.cayenne.access.jdbc.PSParameter; +import org.apache.cayenne.access.translator.TranslatedSQL; import org.apache.cayenne.access.types.ExtendedTypeMap; import org.apache.cayenne.dba.DbAdapter; import org.junit.jupiter.api.BeforeEach; diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java index 95831d1b2..625a87299 100644 --- a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java @@ -30,18 +30,18 @@ import org.apache.cayenne.access.dbsync.DefaultSchemaUpdateStrategyFactory; import org.apache.cayenne.access.dbsync.SchemaUpdateStrategyFactory; import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy; import org.apache.cayenne.access.dbsync.ThrowOnPartialOrCreateSchemaStrategy; -import org.apache.cayenne.access.translator.sqltemplate.SQLTemplateTranslator; +import org.apache.cayenne.access.translator.SQLTemplateTranslator; import org.apache.cayenne.access.jdbc.reader.RowReaderFactory; -import org.apache.cayenne.access.translator.batch.BatchTranslator; +import org.apache.cayenne.access.translator.BatchTranslator; import org.apache.cayenne.access.translator.batch.DeleteBatchTranslator; import org.apache.cayenne.access.translator.batch.InsertBatchTranslator; import org.apache.cayenne.access.translator.batch.UpdateBatchTranslator; import org.apache.cayenne.access.translator.procedure.DbAdapterDelegatedProcedureTranslator; -import org.apache.cayenne.access.translator.procedure.ProcedureTranslator; +import org.apache.cayenne.access.translator.ProcedureTranslator; import org.apache.cayenne.access.translator.ejbql.DbAdapterDelegatedEJBQLTranslator; -import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator; +import org.apache.cayenne.access.translator.EJBQLTranslator; import org.apache.cayenne.access.translator.select.DbAdapterDelegatedSelectTranslator; -import org.apache.cayenne.access.translator.select.SelectTranslator; +import org.apache.cayenne.access.translator.SelectTranslator; import org.apache.cayenne.access.types.DefaultValueObjectTypeRegistry; import org.apache.cayenne.access.types.ValueObjectTypeRegistry; import org.apache.cayenne.annotation.PostLoad; diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java index 06b48b562..c1865c09e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.cayenne.configuration.runtime; -import org.apache.cayenne.access.translator.batch.BatchTranslator; +import org.apache.cayenne.access.translator.BatchTranslator; import org.apache.cayenne.access.types.DefaultValueObjectTypeRegistry; import org.apache.cayenne.access.types.ValueObjectTypeRegistry; import org.apache.cayenne.configuration.Constants;
