change: - 'IMigrationStep' should use the handy 'SimpleJdbcTemplate' instead of 'JdbcTemplate'.

remove: - Programmatic error from 'MigrationStepFrom022To23'.

SVN: 7861

dbmigration/source/java/ch/systemsx/cisd/dbmigration/IJavaMigrationStepExecutor.java

@@ -19,11 +19,21 @@ package ch.systemsx.cisd.dbmigration;
 import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.exceptions.Status;
 
-
+/**
+ * A migration step executor.
+ * 
+ * @author Christian Ribeaud
+ */
 public interface IJavaMigrationStepExecutor
 {
 
+    /**
+     * Performs some step after the migration has happened.
+     */
     public Status tryPerformPostMigration(final Script sqlScript);
 
+    /**
+     * Performs some step before the migration has happened.
+     */
     public Status tryPerformPreMigration(final Script sqlScript);
 }

dbmigration/source/java/ch/systemsx/cisd/dbmigration/IMigrationStep.java

@@ -16,7 +16,7 @@
 
 package ch.systemsx.cisd.dbmigration;
 
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 
 import ch.systemsx.cisd.common.exceptions.Status;
 
@@ -44,11 +44,11 @@ public interface IMigrationStep
     /**
      * Called before the SQL migration is performed.
      */
-    public Status performPreMigration(JdbcTemplate jdbcTemplate);
+    public Status performPreMigration(final SimpleJdbcTemplate simpleJdbcTemplate);
 
     /**
      * Called after the SQL migration has been performed.
      */
-    public Status performPostMigration(JdbcTemplate jdbcTemplate);
+    public Status performPostMigration(final SimpleJdbcTemplate simpleJdbcTemplate);
 
 }

dbmigration/source/java/ch/systemsx/cisd/dbmigration/JavaMigrationStepExecutor.java

@@ -22,7 +22,7 @@ import java.util.List;
 import javax.sql.DataSource;
 
 import org.apache.commons.lang.StringUtils;
-import org.springframework.jdbc.core.support.JdbcDaoSupport;
+import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
 
 import ch.systemsx.cisd.common.Script;
 import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
@@ -40,7 +40,8 @@ import ch.systemsx.cisd.common.utilities.ClassUtils;
  * 
  * @author Izabela Adamczyk
  */
-public class JavaMigrationStepExecutor extends JdbcDaoSupport implements IJavaMigrationStepExecutor
+public class JavaMigrationStepExecutor extends SimpleJdbcDaoSupport implements
+        IJavaMigrationStepExecutor
 {
     private static final String JAVA_MIGRATION_STEP_PREFIX = "--JAVA";
 
@@ -127,18 +128,23 @@ public class JavaMigrationStepExecutor extends JdbcDaoSupport implements IJavaMi
         }
     }
 
+    //
+    // IJavaMigrationStepExecutor
+    //
+
     /**
      * Returns null if MigrationStep has not been found and status returned by
-     * {@link  IMigrationStep#performPreMigration(org.springframework.jdbc.core.JdbcTemplate)}
+     * {@link  IMigrationStep#performPreMigration(org.springframework.jdbc.core.simple.SimpleJdbcTemplate)}
      * otherwise.
      */
-    public Status tryPerformPreMigration(final Script sqlScript)
+    public final Status tryPerformPreMigration(final Script sqlScript)
 
     {
         final IMigrationStep migrationStep = tryExtractMigrationStep(sqlScript);
         if (migrationStep != null)
         {
-            final Status preMigrationStatus = migrationStep.performPreMigration(getJdbcTemplate());
+            final Status preMigrationStatus =
+                    migrationStep.performPreMigration(getSimpleJdbcTemplate());
             return preMigrationStatus;
         } else
         {
@@ -148,16 +154,16 @@ public class JavaMigrationStepExecutor extends JdbcDaoSupport implements IJavaMi
 
     /**
      * Returns null if MigrationStep has not been found and status returned by
-     * {@link  IMigrationStep#performPostMigration(org.springframework.jdbc.core.JdbcTemplate)}
+     * {@link  IMigrationStep#performPostMigration(org.springframework.jdbc.core.simple.SimpleJdbcTemplate)}
      * otherwise.
      */
-    public Status tryPerformPostMigration(final Script sqlScript)
+    public final Status tryPerformPostMigration(final Script sqlScript)
     {
         final IMigrationStep migrationStep = tryExtractMigrationStep(sqlScript);
         if (migrationStep != null)
         {
             final Status postMigrationStatus =
-                    migrationStep.performPostMigration(getJdbcTemplate());
+                    migrationStep.performPostMigration(getSimpleJdbcTemplate());
             return postMigrationStatus;
         } else
         {

dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/MigrationStepFrom001To002.java

@@ -16,23 +16,28 @@
 
 package ch.systemsx.cisd.dbmigration;
 
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 
 import ch.systemsx.cisd.common.exceptions.Status;
 
 /**
+ * A <code>IMigrationStep</code> implementation for test.
+ * 
  * @author Izabela Adamczyk
  */
 public class MigrationStepFrom001To002 implements IMigrationStep
 {
 
-    public Status performPostMigration(final JdbcTemplate jdbcTemplate)
-    {
+    //
+    // IMigrationStep
+    //
 
+    public final Status performPostMigration(final SimpleJdbcTemplate simpleJdbcTemplate)
+    {
         return Status.OK;
     }
 
-    public Status performPreMigration(final JdbcTemplate jdbcTemplate)
+    public final Status performPreMigration(final SimpleJdbcTemplate simpleJdbcTemplate)
     {
         return Status.OK;
     }

dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/MigrationStepFrom002To003.java

@@ -16,23 +16,28 @@
 
 package ch.systemsx.cisd.dbmigration;
 
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 
 import ch.systemsx.cisd.common.exceptions.Status;
 
 /**
+ * A <code>IMigrationStep</code> implementation for test.
+ * 
  * @author Izabela Adamczyk
  */
 public class MigrationStepFrom002To003 implements IMigrationStep
 {
 
-    public Status performPostMigration(final JdbcTemplate jdbcTemplate)
-    {
+    //
+    // IMigrationStep
+    //
 
+    public final Status performPostMigration(final SimpleJdbcTemplate simpleJdbcTemplate)
+    {
         return Status.createError("bad post");
     }
 
-    public Status performPreMigration(final JdbcTemplate jdbcTemplate)
+    public final Status performPreMigration(final SimpleJdbcTemplate simpleJdbcTemplate)
     {
         return Status.createError("bad pre");
     }