This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit d2408475d53eb72cb15bfd884fc245589c15b5af Author: Nikita Timofeev <[email protected]> AuthorDate: Fri Jul 1 18:35:36 2022 +0300 CAY-2737 Cayenne 4.3: cleanup deprecated code --- .../unit/di/server/ServerCaseDbAdapterProvider.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java index 3d30653f0..ef8e9246d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java @@ -19,9 +19,11 @@ package org.apache.cayenne.unit.di.server; import org.apache.cayenne.ConfigurationException; +import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider; import org.apache.cayenne.conn.DataSourceInfo; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.dba.JdbcAdapter; +import org.apache.cayenne.dba.PkGenerator; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Provider; @@ -31,15 +33,22 @@ public class ServerCaseDbAdapterProvider implements Provider<JdbcAdapter> { private DataSourceInfo dataSourceInfo; private AdhocObjectFactory objectFactory; - public ServerCaseDbAdapterProvider(@Inject DataSourceInfo dataSourceInfo, - @Inject AdhocObjectFactory objectFactory) { + private PkGeneratorFactoryProvider pkGeneratorProvider; + + public ServerCaseDbAdapterProvider( + @Inject DataSourceInfo dataSourceInfo, + @Inject AdhocObjectFactory objectFactory, + @Inject PkGeneratorFactoryProvider pkGeneratorProvider) { this.dataSourceInfo = dataSourceInfo; this.objectFactory = objectFactory; + this.pkGeneratorProvider = pkGeneratorProvider; } public JdbcAdapter get() throws ConfigurationException { - - return objectFactory.newInstance(DbAdapter.class, dataSourceInfo - .getAdapterClassName()); + JdbcAdapter jdbcAdapter = objectFactory.newInstance(DbAdapter.class, dataSourceInfo.getAdapterClassName()); + PkGenerator pkGenerator = pkGeneratorProvider.get(jdbcAdapter); + jdbcAdapter.setPkGenerator(pkGenerator); + pkGenerator.setAdapter(jdbcAdapter); + return jdbcAdapter; } }
