You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/03/16 16:02:44 UTC
svn commit: r1578097 - in
/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba:
db2/ derby/ firebird/ frontbase/ h2/ hsqldb/ ingres/ mysql/ openbase/
oracle/ postgres/ sqlite/ sqlserver/ sybase/
Author: aadamchik
Date: Sun Mar 16 15:02:43 2014
New Revision: 1578097
URL: http://svn.apache.org/r1578097
Log:
java 6 annotations
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java Sun Mar 16 15:02:43 2014
@@ -38,6 +38,7 @@ public class DB2Sniffer implements DbAda
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("DB2")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java Sun Mar 16 15:02:43 2014
@@ -40,6 +40,7 @@ public class DerbySniffer implements DbA
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("APACHE DERBY")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java Sun Mar 16 15:02:43 2014
@@ -34,6 +34,7 @@ public class FirebirdSniffer implements
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("FIREBIRD")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java Sun Mar 16 15:02:43 2014
@@ -38,6 +38,7 @@ public class FrontBaseSniffer implements
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("FRONTBASE")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java Sun Mar 16 15:02:43 2014
@@ -38,6 +38,7 @@ public class H2Sniffer implements DbAdap
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("H2")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java Sun Mar 16 15:02:43 2014
@@ -40,6 +40,7 @@ public class HSQLDBSniffer implements Db
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
if (dbName == null || !dbName.toUpperCase().contains("HSQL")) {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java Sun Mar 16 15:02:43 2014
@@ -40,6 +40,7 @@ public class IngresSniffer implements Db
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("INGRES")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java Sun Mar 16 15:02:43 2014
@@ -42,6 +42,7 @@ public class MySQLSniffer implements DbA
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
if (dbName == null || !dbName.toUpperCase().contains("MYSQL")) {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java Sun Mar 16 15:02:43 2014
@@ -40,6 +40,7 @@ public class OpenBaseSniffer implements
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("OPENBASE")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java Sun Mar 16 15:02:43 2014
@@ -38,6 +38,7 @@ public class OracleSniffer implements Db
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
if (dbName == null || !dbName.toUpperCase().contains("ORACLE")) {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java Sun Mar 16 15:02:43 2014
@@ -38,6 +38,7 @@ public class PostgresSniffer implements
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
return dbName != null && dbName.toUpperCase().contains("POSTGRESQL")
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java Sun Mar 16 15:02:43 2014
@@ -39,6 +39,7 @@ public class SQLiteSniffer implements Db
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
if (dbName == null || !dbName.toUpperCase().contains("SQLITE")) {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java Sun Mar 16 15:02:43 2014
@@ -40,6 +40,7 @@ public class SQLServerSniffer implements
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
String dbName = md.getDatabaseProductName();
if (dbName == null || !dbName.toUpperCase().contains("MICROSOFT SQL SERVER")) {
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java?rev=1578097&r1=1578096&r2=1578097&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java Sun Mar 16 15:02:43 2014
@@ -40,6 +40,7 @@ public class SybaseSniffer implements Db
this.objectFactory = objectFactory;
}
+ @Override
public DbAdapter createAdapter(DatabaseMetaData md) throws SQLException {
// JTDS driver returns "sql server" for Sybase, so need to handle it differently
String driver = md.getDriverName();