Refactoring PKs - Refactoring sniffers, DefaultDbAdapterFactory
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/08597065 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/08597065 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/08597065 Branch: refs/heads/master Commit: 08597065f41fd7052f9e02018723b39f56f60035 Parents: b2f8026 Author: Aleksey Pleshkanev <priest...@hotmail.com> Authored: Sun Apr 15 20:38:47 2018 +0300 Committer: Aleksey Pleshkanev <priest...@hotmail.com> Committed: Sun Apr 15 20:38:47 2018 +0300 ---------------------------------------------------------------------- .../cayenne/configuration/server/DefaultDbAdapterFactory.java | 1 + .../src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java | 2 +- .../src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java | 2 +- .../main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java | 2 +- .../java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java | 2 +- .../src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java | 2 +- .../src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java | 2 +- .../main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java | 2 +- .../src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java index b3d1605..13a76d6 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java @@ -86,6 +86,7 @@ public class DefaultDbAdapterFactory implements DbAdapterFactory { if (adapterType != null) { JdbcAdapter dbAdapter = objectFactory.newInstance(DbAdapter.class, adapterType); PkGenerator pkGenerator = pkGeneratorProvider.get(dbAdapter); + pkGenerator.setAdapter(dbAdapter); dbAdapter.setPkGenerator(pkGenerator); return dbAdapter; } else { http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java index 727b4dd..578d827 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java @@ -49,7 +49,7 @@ public class DB2Sniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, DB2Adapter.class.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java index a07c2ab..3077164 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java @@ -52,7 +52,7 @@ public class DerbySniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, DerbyAdapter.class.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java index 9e674c2..5bd40aa 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java @@ -46,7 +46,7 @@ public class FirebirdSniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, FirebirdAdapter.class.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java index 900f5d2..9bfb81f 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java @@ -49,7 +49,7 @@ public class FrontBaseSniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, FrontBaseAdapter.class.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java index 1e2204a..47cea1e 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java @@ -49,7 +49,7 @@ public class H2Sniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, H2Adapter.class.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java index 20c0279..3a9dad1 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java @@ -52,7 +52,7 @@ public class IngresSniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, IngresAdapter.class.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java index 7f5e2b0..4c8a219 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java @@ -51,7 +51,7 @@ public class OpenBaseSniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, OpenBaseAdapter.class.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/08597065/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java index 3a33b64..ac5d022 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java @@ -50,7 +50,7 @@ public class SQLiteSniffer implements DbAdapterDetector { return null; } - return objectFactory.<JdbcAdapter>newInstance( + return objectFactory.newInstance( DbAdapter.class, SQLiteAdapter.class.getName()); }
