Merge pull request #629 from apache/CAY-2889

CAY-2889 Updated PK generators to avoid needlessly calling super.methods()

Author: stariy95

cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java

@@ -157,7 +157,7 @@ protected long getLongPrimaryKey(Statement statement, String entityName) throws
         statement.execute(lockString);
 
         // select
-        String selectString = super.pkSelectString(entityName);
+        String selectString = pkSelectString(entityName);
         adapter.getJdbcEventLogger().log(selectString);
         long pk;
         try (ResultSet rs = statement.executeQuery(selectString)) {
@@ -172,7 +172,7 @@ protected long getLongPrimaryKey(Statement statement, String entityName) throws
         }
 
         // update
-        String updateString = super.pkUpdateString(entityName) + " AND NEXT_ID = " + pk;
+        String updateString = pkUpdateString(entityName) + " AND NEXT_ID = " + pk;
         adapter.getJdbcEventLogger().log(updateString);
         int updated = statement.executeUpdate(updateString);
         // optimistic lock failure...

cayenne/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java

@@ -193,9 +193,9 @@ protected int pkCacheSize(DbEntity entity) {
                 && keyGenerator.getGeneratorName() != null) {
 
             Integer size = keyGenerator.getKeyCacheSize();
-            return (size != null && size >= 1) ? size : super.getPkCacheSize();
+            return (size != null && size >= 1) ? size : getPkCacheSize();
         } else {
-            return super.getPkCacheSize();
+            return getPkCacheSize();
         }
     }
 

cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java

@@ -100,8 +100,8 @@ protected String pkTableCreateString() {
 	@Override
 	public void createAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception {
 		super.createAutoPk(node, dbEntities);
-		super.runUpdate(node, safePkProcDrop());
-		super.runUpdate(node, unsafePkProcCreate());
+		runUpdate(node, safePkProcDrop());
+		runUpdate(node, unsafePkProcCreate());
 	}
 
 	@Override
@@ -139,8 +139,8 @@ public List<String> createAutoPkStatements(List<DbEntity> dbEntities) {
 	 */
 	@Override
 	public void dropAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception {
-		super.runUpdate(node, safePkProcDrop());
-		super.runUpdate(node, safePkTableDrop());
+		runUpdate(node, safePkProcDrop());
+		runUpdate(node, safePkTableDrop());
 	}
 
 	@Override
@@ -170,7 +170,7 @@ protected long longPkFromDatabase(DataNode node, DbEntity entity) throws Excepti
 		try (Connection connection = node.getDataSource().getConnection()) {
 			try (CallableStatement statement = connection.prepareCall("{call auto_pk_for_table(?, ?)}")) {
 				statement.setString(1, entity.getName());
-				statement.setInt(2, super.getPkCacheSize());
+				statement.setInt(2, getPkCacheSize());
 
 				// can't use "executeQuery" per http://jtds.sourceforge.net/faq.html#expectingResultSet
 				statement.execute();