You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/04/18 09:59:23 UTC
[19/19] cayenne git commit: CAY-1683 Injectable PkGenerator cleanup
after PR #277 merge release notes
CAY-1683 Injectable PkGenerator
cleanup after PR #277 merge
release notes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/dd833a6c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/dd833a6c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/dd833a6c
Branch: refs/heads/master
Commit: dd833a6c6c8adb519c643ae8400d2d9952b323f8
Parents: 3a1712a
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 18 12:57:35 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 18 12:57:35 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../reverse/configuration/ToolsModule.java | 2 +-
.../apache/cayenne/configuration/Constants.java | 6 --
.../server/DefaultDbAdapterFactory.java | 24 +++--
.../server/PkGeneratorFactoryProvider.java | 27 ++++-
.../configuration/server/ServerModule.java | 3 +-
.../java/org/apache/cayenne/dba/DbAdapter.java | 7 ++
.../org/apache/cayenne/dba/JdbcAdapter.java | 1 +
.../org/apache/cayenne/dba/JdbcPkGenerator.java | 3 +
.../org/apache/cayenne/dba/PkGenerator.java | 4 +
.../apache/cayenne/dba/db2/DB2PkGenerator.java | 4 +
.../org/apache/cayenne/dba/db2/DB2Sniffer.java | 4 -
.../cayenne/dba/derby/DerbyPkGenerator.java | 4 +
.../apache/cayenne/dba/derby/DerbySniffer.java | 7 +-
.../cayenne/dba/firebird/FirebirdSniffer.java | 4 -
.../dba/frontbase/FrontBasePkGenerator.java | 4 +
.../cayenne/dba/frontbase/FrontBaseSniffer.java | 4 -
.../apache/cayenne/dba/h2/H2PkGenerator.java | 4 +
.../org/apache/cayenne/dba/h2/H2Sniffer.java | 4 -
.../cayenne/dba/hsqldb/HSQLDBSniffer.java | 7 +-
.../cayenne/dba/ingres/IngresPkGenerator.java | 4 +
.../cayenne/dba/ingres/IngresSniffer.java | 5 -
.../cayenne/dba/mysql/MySQLPkGenerator.java | 4 +
.../apache/cayenne/dba/mysql/MySQLSniffer.java | 3 -
.../dba/openbase/OpenBasePkGenerator.java | 4 +
.../cayenne/dba/openbase/OpenBaseSniffer.java | 4 -
.../cayenne/dba/oracle/OraclePkGenerator.java | 4 +
.../cayenne/dba/oracle/OracleSniffer.java | 7 +-
.../dba/postgres/PostgresPkGenerator.java | 4 +
.../cayenne/dba/postgres/PostgresSniffer.java | 4 -
.../cayenne/dba/sqlite/SQLiteSniffer.java | 4 -
.../dba/sqlserver/SQLServerActionBuilder.java | 1 -
.../cayenne/dba/sqlserver/SQLServerAdapter.java | 1 -
.../dba/sqlserver/SQLServerPkGenerator.java | 21 ++++
.../cayenne/dba/sqlserver/SQLServerSniffer.java | 6 +-
.../cayenne/dba/sybase/SybasePkGenerator.java | 4 +
.../cayenne/dba/sybase/SybaseSniffer.java | 4 -
.../server/DefaultDbAdapterFactoryTest.java | 108 +++----------------
.../dba/sqlserver/SQLServerSnifferIT.java | 8 +-
39 files changed, 145 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index a619bcc..67139ea 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -13,6 +13,7 @@ Date:
----------------------------------
Changes/New Features:
+CAY-1683 Injectable PkGenerator
CAY-2304 Custom ClassLoader for Maven and Gradle plugins that use project dependencies
CAY-2334 cgen: option to force run from maven/gradle
CAY-2337 Save reverse engineering configuration with datamap XML
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
----------------------------------------------------------------------
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 2dd7f2e..0f41ffd 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
@@ -119,7 +119,7 @@ public class ToolsModule implements Module {
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
- ServerModule.contributePkGenerators(binder).put(SQLServerAdapter.class.getName(), SybasePkGenerator.class);
+ ServerModule.contributePkGenerators(binder);
binder.bind(DbAdapterFactory.class).to(DefaultDbAdapterFactory.class);
binder.bind(DataSourceFactory.class).to(DriverDataSourceFactory.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 bc35d84..2704ae4 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
@@ -45,12 +45,6 @@ public interface Constants {
String SERVER_ADAPTER_DETECTORS_LIST = "cayenne.server.adapter_detectors";
/**
- * A DI container key for the Map<Key, PkGenerator.class> that objects
- * that can discover the type of current database and install correct PkGenerator in runtime.
- */
- String SERVER_PK_GENERATORS_MAP = "cayenne.server.pk_generators";
-
- /**
* A DI container key for the List<DataChannelFilter> storing
* DataDomain filters.
*
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 13a76d6..4a489cd 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
@@ -84,11 +84,8 @@ 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;
+ DbAdapter dbAdapter = objectFactory.newInstance(DbAdapter.class, adapterType);
+ return setupPkGenerator(dbAdapter);
} else {
return new AutoAdapter(() -> detectAdapter(dataSource), jdbcEventLogger);
}
@@ -121,7 +118,7 @@ public class DefaultDbAdapterFactory implements DbAdapterFactory {
// TODO: should detector do this??
injector.injectMembers(adapter);
- return adapter;
+ return setupPkGenerator(adapter);
}
}
@@ -132,4 +129,19 @@ public class DefaultDbAdapterFactory implements DbAdapterFactory {
jdbcEventLogger.log("Failed to detect database type, using generic adapter");
return objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
}
+
+ /**
+ * Setup PK generator for the adapter
+ * @param dbAdapter to process
+ * @return db adapter
+ * @since 4.1
+ */
+ protected DbAdapter setupPkGenerator(DbAdapter dbAdapter) {
+ PkGenerator pkGenerator = pkGeneratorProvider.get(Objects.requireNonNull(dbAdapter));
+ if(pkGenerator != null) {
+ pkGenerator.setAdapter(dbAdapter);
+ dbAdapter.setPkGenerator(pkGenerator);
+ }
+ return dbAdapter;
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java
index d003782..8d016eb 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java
@@ -1,16 +1,39 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
package org.apache.cayenne.configuration.server;
-import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.dba.PerAdapterProvider;
import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.di.Inject;
import java.util.Map;
+/**
+ * Per-adapter provider of PkGenerators
+ *
+ * @since 4.1
+ */
public class PkGeneratorFactoryProvider extends PerAdapterProvider<PkGenerator> {
public PkGeneratorFactoryProvider(
- @Inject(Constants.SERVER_PK_GENERATORS_MAP) Map<String, PkGenerator> perAdapterValues,
+ @Inject Map<String, PkGenerator> perAdapterValues,
@Inject PkGenerator defaultValue) {
super(perAdapterValues, defaultValue);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
index cc0c3c5..39e8c14 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
@@ -236,9 +236,10 @@ public class ServerModule implements Module {
*
* @param binder DI binder passed to the module during injector startup.
* @return MapBuilder for properties.
+ * @since 4.1
*/
public static MapBuilder<PkGenerator> contributePkGenerators(Binder binder) {
- return binder.bindMap(PkGenerator.class, Constants.SERVER_PK_GENERATORS_MAP);
+ return binder.bindMap(PkGenerator.class);
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 12d4f9a..ae8073e 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
@@ -144,6 +144,13 @@ public interface DbAdapter {
PkGenerator getPkGenerator();
/**
+ * Set custom PK generator associated with this DbAdapter.
+ * @param pkGenerator to set
+ * @since 4.1
+ */
+ void setPkGenerator(PkGenerator pkGenerator);
+
+ /**
* Creates and returns a DbAttribute based on supplied parameters (usually
* obtained from database meta data).
*
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 72b84a9..4db2b38 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
@@ -228,6 +228,7 @@ public class JdbcAdapter implements DbAdapter {
*
* @since 1.1
*/
+ @Override
public void setPkGenerator(PkGenerator pkGenerator) {
this.pkGenerator = pkGenerator;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
index d427699..329caed 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
@@ -59,6 +59,9 @@ public class JdbcPkGenerator implements PkGenerator {
protected int pkCacheSize = DEFAULT_PK_CACHE_SIZE;
protected long pkStartValue = DEFAULT_PK_START_VALUE;
+ /**
+ * @since 4.1
+ */
public JdbcPkGenerator() {
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/PkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/PkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/PkGenerator.java
index 97d8f01..0d625f0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/PkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/PkGenerator.java
@@ -72,11 +72,15 @@ public interface PkGenerator {
/**
* Install the adapter associated with current PkGenerator
+ *
+ * @since 4.1
*/
void setAdapter(DbAdapter q);
/**
* Get an adapter associated with current PkGenerator
+ *
+ * @since 4.1
*/
DbAdapter getAdapter();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java
index beed26b..409b33e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java
@@ -27,6 +27,10 @@ import org.apache.cayenne.map.DbEntity;
*/
public class DB2PkGenerator extends OraclePkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public DB2PkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 578d827..c7f2f74 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
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.db2;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* @since 1.2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyPkGenerator.java
index 6b9a7c4..4337d03 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyPkGenerator.java
@@ -30,6 +30,10 @@ import org.apache.cayenne.map.DbEntity;
*/
public class DerbyPkGenerator extends OraclePkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public DerbyPkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 3077164..5c0474f 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
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.derby;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* Creates a DerbyAdapter if Apache Derby database is detected.
@@ -40,8 +36,7 @@ public class DerbySniffer implements DbAdapterDetector {
protected AdhocObjectFactory objectFactory;
- public DerbySniffer(@Inject AdhocObjectFactory objectFactory,
- @Inject PkGeneratorFactoryProvider pkGeneratorProvider) {
+ public DerbySniffer(@Inject AdhocObjectFactory objectFactory) {
this.objectFactory = objectFactory;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 5bd40aa..ae882c0 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
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.firebird;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
public class FirebirdSniffer implements DbAdapterDetector {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
index ecedfdc..e7bbdde 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
@@ -39,6 +39,10 @@ import java.util.List;
*/
public class FrontBasePkGenerator extends JdbcPkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public FrontBasePkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 9bfb81f..9400b34 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
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.frontbase;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* @since 1.2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 3c49d33..edd96b2 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
@@ -30,6 +30,10 @@ import org.apache.cayenne.map.DbEntity;
*/
public class H2PkGenerator extends OraclePkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public H2PkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 47cea1e..c4a3356 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
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.h2;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* @since 3.0
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
index bb9954e..6d88b6e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.hsqldb;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* Detects HSQLDB database from JDBC metadata.
@@ -40,8 +36,7 @@ public class HSQLDBSniffer implements DbAdapterDetector {
protected AdhocObjectFactory objectFactory;
- public HSQLDBSniffer(@Inject AdhocObjectFactory objectFactory,
- @Inject PkGeneratorFactoryProvider pkGeneratorProvider) {
+ public HSQLDBSniffer(@Inject AdhocObjectFactory objectFactory) {
this.objectFactory = objectFactory;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresPkGenerator.java
index c5f73f5..b39bc87 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresPkGenerator.java
@@ -29,6 +29,10 @@ import org.apache.cayenne.dba.oracle.OraclePkGenerator;
*/
public class IngresPkGenerator extends OraclePkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public IngresPkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 3a9dad1..dba808c 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
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.ingres;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* Detects Ingres database from JDBC metadata.
@@ -40,7 +36,6 @@ public class IngresSniffer implements DbAdapterDetector {
protected AdhocObjectFactory objectFactory;
-
public IngresSniffer(@Inject AdhocObjectFactory objectFactory) {
this.objectFactory = objectFactory;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
index 3c1414d..c15b002 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
@@ -40,6 +40,10 @@ public class MySQLPkGenerator extends JdbcPkGenerator {
private static final Logger logger = LoggerFactory.getLogger(MySQLPkGenerator.class);
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public MySQLPkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
index c62d9e2..36dd84a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
@@ -20,9 +20,7 @@
package org.apache.cayenne.dba.mysql;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
@@ -30,7 +28,6 @@ import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Objects;
/**
* Detects MySQL database from JDBC metadata.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
index 79a4f10..53e3bc6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
@@ -43,6 +43,10 @@ import java.util.List;
*/
public class OpenBasePkGenerator extends JdbcPkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public OpenBasePkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 4c8a219..4c86a81 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
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.openbase;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* Detects OpenBase DB from JDBC metadata.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
index 10b0349..0e2b863 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
@@ -52,6 +52,10 @@ import java.util.List;
*/
public class OraclePkGenerator extends JdbcPkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public OraclePkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
index ff5ae37..f2c219d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.oracle;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* @since 1.2
@@ -38,8 +34,7 @@ public class OracleSniffer implements DbAdapterDetector {
protected AdhocObjectFactory objectFactory;
- public OracleSniffer(@Inject AdhocObjectFactory objectFactory,
- @Inject PkGeneratorFactoryProvider pkGeneratorProvider) {
+ public OracleSniffer(@Inject AdhocObjectFactory objectFactory) {
this.objectFactory = objectFactory;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java
index 03d6467..643659a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresPkGenerator.java
@@ -28,6 +28,10 @@ import org.apache.cayenne.map.DbEntity;
*/
public class PostgresPkGenerator extends OraclePkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public PostgresPkGenerator() {
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
index b6b6073..18acacf 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.postgres;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* @since 1.2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 ac5d022..7b9c2ad 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
@@ -19,16 +19,12 @@
package org.apache.cayenne.dba.sqlite;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* Detects SQLite database from JDBC metadata.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/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 530d555..6630a8b 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
@@ -24,7 +24,6 @@ import org.apache.cayenne.dba.JdbcActionBuilder;
import org.apache.cayenne.query.BatchQuery;
import org.apache.cayenne.query.ProcedureQuery;
import org.apache.cayenne.query.SQLAction;
-import org.apache.cayenne.query.SelectQuery;
/**
* @since 1.2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
index 7739ad1..a94bf62 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
@@ -30,7 +30,6 @@ import org.apache.cayenne.access.types.ExtendedTypeFactory;
import org.apache.cayenne.access.types.ValueObjectTypeRegistry;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.dba.sybase.SybaseAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.EntityResolver;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java
index 7537288..844571e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java
@@ -1,3 +1,22 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
package org.apache.cayenne.dba.sqlserver;
import org.apache.cayenne.CayenneRuntimeException;
@@ -20,6 +39,8 @@ import java.util.List;
* The default PK generator for MS SQL,
* which uses sequences to generate a PK for an integer key type
* and NEWID() for UNIQUEIDENTIFIER key type
+ *
+ * @since 4.1
*/
public class SQLServerPkGenerator extends OraclePkGenerator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
index 411627a..b0318e9 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
@@ -20,15 +20,12 @@
package org.apache.cayenne.dba.sqlserver;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* Detects SQLServer database from JDBC metadata.
@@ -39,8 +36,7 @@ public class SQLServerSniffer implements DbAdapterDetector {
protected AdhocObjectFactory objectFactory;
- public SQLServerSniffer(@Inject AdhocObjectFactory objectFactory,
- @Inject PkGeneratorFactoryProvider pkGeneratorProvider) {
+ public SQLServerSniffer(@Inject AdhocObjectFactory objectFactory) {
this.objectFactory = objectFactory;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
index a309f23..0b24653 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
@@ -40,6 +40,10 @@ import java.util.List;
*/
public class SybasePkGenerator extends JdbcPkGenerator {
+ /**
+ * Used by DI
+ * @since 4.1
+ */
public SybasePkGenerator(){
super();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
index 38f0e05..ebe2228 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
@@ -20,16 +20,12 @@
package org.apache.cayenne.dba.sybase;
import org.apache.cayenne.configuration.server.DbAdapterDetector;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
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 java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import java.util.Objects;
/**
* Detects Sybase database from JDBC metadata.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
index 6cf2f13..0d7b5d7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
@@ -29,30 +29,10 @@ import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.dba.AutoAdapter;
import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.JdbcPkGenerator;
import org.apache.cayenne.dba.PkGenerator;
-import org.apache.cayenne.dba.db2.DB2Adapter;
-import org.apache.cayenne.dba.db2.DB2PkGenerator;
-import org.apache.cayenne.dba.derby.DerbyAdapter;
-import org.apache.cayenne.dba.derby.DerbyPkGenerator;
-import org.apache.cayenne.dba.frontbase.FrontBaseAdapter;
-import org.apache.cayenne.dba.frontbase.FrontBasePkGenerator;
-import org.apache.cayenne.dba.h2.H2Adapter;
-import org.apache.cayenne.dba.h2.H2PkGenerator;
-import org.apache.cayenne.dba.ingres.IngresAdapter;
-import org.apache.cayenne.dba.ingres.IngresPkGenerator;
-import org.apache.cayenne.dba.mysql.MySQLAdapter;
-import org.apache.cayenne.dba.mysql.MySQLPkGenerator;
-import org.apache.cayenne.dba.openbase.OpenBaseAdapter;
-import org.apache.cayenne.dba.openbase.OpenBasePkGenerator;
-import org.apache.cayenne.dba.oracle.Oracle8Adapter;
-import org.apache.cayenne.dba.oracle.OracleAdapter;
-import org.apache.cayenne.dba.oracle.OraclePkGenerator;
-import org.apache.cayenne.dba.postgres.PostgresAdapter;
-import org.apache.cayenne.dba.postgres.PostgresPkGenerator;
-import org.apache.cayenne.dba.sqlserver.SQLServerAdapter;
import org.apache.cayenne.dba.sybase.SybaseAdapter;
-import org.apache.cayenne.dba.sybase.SybasePkGenerator;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.ClassLoaderManager;
import org.apache.cayenne.di.DIBootstrap;
@@ -68,8 +48,6 @@ import org.apache.cayenne.resource.ClassLoaderResourceLocator;
import org.apache.cayenne.resource.ResourceLocator;
import org.junit.Test;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -83,16 +61,12 @@ public class DefaultDbAdapterFactoryTest {
@Test
public void testCreatedAdapter_Auto() throws Exception {
- final DbAdapter adapter = mock(DbAdapter.class);
+ final DbAdapter adapter = mock(JdbcAdapter.class);
when(adapter.createTable(any(DbEntity.class))).thenReturn("XXXXX");
+ when(adapter.unwrap()).thenReturn(adapter);
- List<DbAdapterDetector> detectors = new ArrayList<DbAdapterDetector>();
- detectors.add(new DbAdapterDetector() {
-
- public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
- return adapter;
- }
- });
+ List<DbAdapterDetector> detectors = new ArrayList<>();
+ detectors.add(md -> adapter);
MockConnection connection = new MockConnection();
@@ -101,19 +75,7 @@ public class DefaultDbAdapterFactoryTest {
Module testModule = binder -> {
ServerModule.contributeProperties(binder);
- ServerModule.contributePkGenerators(binder)
- .put(DB2Adapter.class.getName(), DB2PkGenerator.class)
- .put(DerbyAdapter.class.getName(), DerbyPkGenerator.class)
- .put(FrontBaseAdapter.class.getName(), FrontBasePkGenerator.class)
- .put(H2Adapter.class.getName(), H2PkGenerator.class)
- .put(IngresAdapter.class.getName(), IngresPkGenerator.class)
- .put(MySQLAdapter.class.getName(), MySQLPkGenerator.class)
- .put(OpenBaseAdapter.class.getName(), OpenBasePkGenerator.class)
- .put(OracleAdapter.class.getName(), OraclePkGenerator.class)
- .put(Oracle8Adapter.class.getName(), OraclePkGenerator.class)
- .put(PostgresAdapter.class.getName(), PostgresPkGenerator.class)
- .put(SQLServerAdapter.class.getName(), SybasePkGenerator.class)
- .put(SybaseAdapter.class.getName(), SybasePkGenerator.class);
+ ServerModule.contributePkGenerators(binder);
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
@@ -121,6 +83,7 @@ public class DefaultDbAdapterFactoryTest {
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
+ binder.bind(BatchTranslatorFactory.class).toInstance(mock(BatchTranslatorFactory.class));
};
Injector injector = DIBootstrap.createInjector(testModule);
@@ -143,19 +106,7 @@ public class DefaultDbAdapterFactoryTest {
ServerModule.contributeDefaultTypes(binder);
ServerModule.contributeUserTypes(binder);
ServerModule.contributeTypeFactories(binder);
- ServerModule.contributePkGenerators(binder)
- .put(DB2Adapter.class.getName(), DB2PkGenerator.class)
- .put(DerbyAdapter.class.getName(), DerbyPkGenerator.class)
- .put(FrontBaseAdapter.class.getName(), FrontBasePkGenerator.class)
- .put(H2Adapter.class.getName(), H2PkGenerator.class)
- .put(IngresAdapter.class.getName(), IngresPkGenerator.class)
- .put(MySQLAdapter.class.getName(), MySQLPkGenerator.class)
- .put(OpenBaseAdapter.class.getName(), OpenBasePkGenerator.class)
- .put(OracleAdapter.class.getName(), OraclePkGenerator.class)
- .put(Oracle8Adapter.class.getName(), OraclePkGenerator.class)
- .put(PostgresAdapter.class.getName(), PostgresPkGenerator.class)
- .put(SQLServerAdapter.class.getName(), SybasePkGenerator.class)
- .put(SybaseAdapter.class.getName(), SybasePkGenerator.class);
+ ServerModule.contributePkGenerators(binder);
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
@@ -188,26 +139,14 @@ public class DefaultDbAdapterFactoryTest {
DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
nodeDescriptor.setAdapterType(SybaseAdapter.class.getName());
- List<DbAdapterDetector> detectors = new ArrayList<DbAdapterDetector>();
+ List<DbAdapterDetector> detectors = new ArrayList<>();
Module testModule = binder -> {
ServerModule.contributeProperties(binder);
ServerModule.contributeDefaultTypes(binder);
ServerModule.contributeUserTypes(binder);
ServerModule.contributeTypeFactories(binder);
- ServerModule.contributePkGenerators(binder)
- .put(DB2Adapter.class.getName(), DB2PkGenerator.class)
- .put(DerbyAdapter.class.getName(), DerbyPkGenerator.class)
- .put(FrontBaseAdapter.class.getName(), FrontBasePkGenerator.class)
- .put(H2Adapter.class.getName(), H2PkGenerator.class)
- .put(IngresAdapter.class.getName(), IngresPkGenerator.class)
- .put(MySQLAdapter.class.getName(), MySQLPkGenerator.class)
- .put(OpenBaseAdapter.class.getName(), OpenBasePkGenerator.class)
- .put(OracleAdapter.class.getName(), OraclePkGenerator.class)
- .put(Oracle8Adapter.class.getName(), OraclePkGenerator.class)
- .put(PostgresAdapter.class.getName(), PostgresPkGenerator.class)
- .put(SQLServerAdapter.class.getName(), SybasePkGenerator.class)
- .put(SybaseAdapter.class.getName(), SybasePkGenerator.class);
+ ServerModule.contributePkGenerators(binder);
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
@@ -236,16 +175,12 @@ public class DefaultDbAdapterFactoryTest {
@Test
public void testCreatedAdapter_AutoExplicit() throws Exception {
- final DbAdapter adapter = mock(DbAdapter.class);
+ final DbAdapter adapter = mock(JdbcAdapter.class);
when(adapter.createTable(any(DbEntity.class))).thenReturn("XXXXX");
+ when(adapter.unwrap()).thenReturn(adapter);
- List<DbAdapterDetector> detectors = new ArrayList<DbAdapterDetector>();
- detectors.add(new DbAdapterDetector() {
-
- public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
- return adapter;
- }
- });
+ List<DbAdapterDetector> detectors = new ArrayList<>();
+ detectors.add(md -> adapter);
MockConnection connection = new MockConnection();
@@ -254,19 +189,7 @@ public class DefaultDbAdapterFactoryTest {
Module testModule = binder -> {
ServerModule.contributeProperties(binder);
- ServerModule.contributePkGenerators(binder)
- .put(DB2Adapter.class.getName(), DB2PkGenerator.class)
- .put(DerbyAdapter.class.getName(), DerbyPkGenerator.class)
- .put(FrontBaseAdapter.class.getName(), FrontBasePkGenerator.class)
- .put(H2Adapter.class.getName(), H2PkGenerator.class)
- .put(IngresAdapter.class.getName(), IngresPkGenerator.class)
- .put(MySQLAdapter.class.getName(), MySQLPkGenerator.class)
- .put(OpenBaseAdapter.class.getName(), OpenBasePkGenerator.class)
- .put(OracleAdapter.class.getName(), OraclePkGenerator.class)
- .put(Oracle8Adapter.class.getName(), OraclePkGenerator.class)
- .put(PostgresAdapter.class.getName(), PostgresPkGenerator.class)
- .put(SQLServerAdapter.class.getName(), SybasePkGenerator.class)
- .put(SybaseAdapter.class.getName(), SybasePkGenerator.class);
+ ServerModule.contributePkGenerators(binder);
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
@@ -274,6 +197,7 @@ public class DefaultDbAdapterFactoryTest {
binder.bind(JdbcEventLogger.class).to(Slf4jJdbcEventLogger.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
+ binder.bind(BatchTranslatorFactory.class).toInstance(mock(BatchTranslatorFactory.class));
};
Injector injector = DIBootstrap.createInjector(testModule);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/dd833a6c/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
index beac26d..fcfebf2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/sqlserver/SQLServerSnifferIT.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.dba.sqlserver;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
@@ -48,15 +47,12 @@ public class SQLServerSnifferIT extends ServerCase {
@Inject
private AdhocObjectFactory objectFactory;
- @Inject
- private PkGeneratorFactoryProvider pkGeneratorProvider;
-
@Test
public void testCreateAdapter() throws Exception {
- SQLServerSniffer sniffer = new SQLServerSniffer(objectFactory, pkGeneratorProvider);
+ SQLServerSniffer sniffer = new SQLServerSniffer(objectFactory);
- DbAdapter adapter = null;
+ DbAdapter adapter;
try (Connection c = dataSourceFactory.getSharedDataSource().getConnection()) {
adapter = sniffer.createAdapter(c.getMetaData());