You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2008/08/26 05:41:50 UTC
svn commit: r688953 - in
/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration:
./ commands/
Author: cbegin
Date: Mon Aug 25 20:41:49 2008
New Revision: 688953
URL: http://svn.apache.org/viewvc?rev=688953&view=rev
Log:
reformatted code
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/PropertyParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/Command.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/NewCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/Change.java Mon Aug 25 20:41:49 2008
@@ -74,6 +74,6 @@
}
public int compareTo(Object o) {
- return id.compareTo(((Change)o).getId());
+ return id.compareTo(((Change) o).getId());
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java Mon Aug 25 20:41:49 2008
@@ -2,12 +2,8 @@
import org.apache.ibatis.migration.commands.*;
-import java.io.File;
-import java.io.PrintStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.io.*;
+import java.util.*;
public class CommandLine {
@@ -66,19 +62,19 @@
private void runCommand() {
if (INIT.equals(command)) {
- new InitializeCommand(repository,environment,force).execute(params);
+ new InitializeCommand(repository, environment, force).execute(params);
} else if (BOOTSTRAP.equals(command)) {
- new BootstrapCommand(repository,environment,force).execute(params);
+ new BootstrapCommand(repository, environment, force).execute(params);
} else if (NEW.equals(command)) {
- new NewCommand(repository,environment,force).execute(params);
+ new NewCommand(repository, environment, force).execute(params);
} else if (STATUS.equals(command)) {
- new StatusCommand(repository,environment,force).execute(params);
+ new StatusCommand(repository, environment, force).execute(params);
} else if (UP.equals(command)) {
- new UpCommand(repository,environment,force).execute(params);
+ new UpCommand(repository, environment, force).execute(params);
} else if (VERSION.equals(command)) {
- new VersionCommand(repository,environment,force).execute(params);
+ new VersionCommand(repository, environment, force).execute(params);
} else if (DOWN.equals(command)) {
- new DownCommand(repository,environment,force).execute(params);
+ new DownCommand(repository, environment, force).execute(params);
} else {
throw new RuntimeException("Attempt to execute unkown command.");
}
@@ -96,7 +92,7 @@
help = true;
} else if (command == null) {
command = arg;
- } else if (params == null){
+ } else if (params == null) {
params = arg;
} else {
params += " ";
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java Mon Aug 25 20:41:49 2008
@@ -1,10 +1,7 @@
package org.apache.ibatis.migration;
-import java.io.Reader;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.*;
+import java.io.*;
+import java.util.Properties;
public class MigrationReader extends Reader {
@@ -27,9 +24,9 @@
}
}
if (undo) {
- target = new StringReader(PropertyParser.parse(undoBuilder.toString(),variables));
+ target = new StringReader(PropertyParser.parse(undoBuilder.toString(), variables));
} else {
- target = new StringReader(PropertyParser.parse(doBuilder.toString(),variables));
+ target = new StringReader(PropertyParser.parse(doBuilder.toString(), variables));
}
} finally {
source.close();
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/PropertyParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/PropertyParser.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/PropertyParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/PropertyParser.java Mon Aug 25 20:41:49 2008
@@ -1,6 +1,6 @@
package org.apache.ibatis.migration;
-import java.util.*;
+import java.util.Properties;
public class PropertyParser {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/ScriptRunner.java Mon Aug 25 20:41:49 2008
@@ -240,24 +240,31 @@
private static class DriverProxy implements Driver {
private Driver driver;
+
DriverProxy(Driver d) {
this.driver = d;
}
+
public boolean acceptsURL(String u) throws SQLException {
return this.driver.acceptsURL(u);
}
+
public Connection connect(String u, Properties p) throws SQLException {
return this.driver.connect(u, p);
}
+
public int getMajorVersion() {
return this.driver.getMajorVersion();
}
+
public int getMinorVersion() {
return this.driver.getMinorVersion();
}
+
public DriverPropertyInfo[] getPropertyInfo(String u, Properties p) throws SQLException {
return this.driver.getPropertyInfo(u, p);
}
+
public boolean jdbcCompliant() {
return this.driver.jdbcCompliant();
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java Mon Aug 25 20:41:49 2008
@@ -1,15 +1,15 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.*;
import org.apache.ibatis.adhoc.AdHocExecutor;
import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.migration.*;
-import java.util.*;
-import java.sql.*;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.io.*;
+import java.math.BigDecimal;
import java.net.*;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.*;
public abstract class BaseCommand implements Command {
@@ -31,7 +31,7 @@
this.environment = environment;
this.force = force;
}
-
+
protected boolean paramsEmpty(String... params) {
return params == null || params.length < 1 || params[0] == null || params[0].length() < 1;
}
@@ -40,7 +40,7 @@
String[] filenames = scriptPath.list();
Arrays.sort(filenames);
List<Change> migrations = new ArrayList<Change>();
- for(String filename : filenames) {
+ for (String filename : filenames) {
if (filename.endsWith(".sql") && !"bootstrap.sql".equals(filename)) {
Change change = parseChangeFromFilename(filename);
migrations.add(change);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java Mon Aug 25 20:41:49 2008
@@ -3,7 +3,6 @@
import org.apache.ibatis.migration.*;
import java.io.*;
-import java.util.Arrays;
public class BootstrapCommand extends BaseCommand {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/Command.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/Command.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/Command.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/Command.java Mon Aug 25 20:41:49 2008
@@ -1,5 +1,5 @@
package org.apache.ibatis.migration.commands;
public interface Command {
- void execute (String... params);
+ void execute(String... params);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java Mon Aug 25 20:41:49 2008
@@ -1,15 +1,11 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.Change;
-import org.apache.ibatis.migration.MigrationReader;
-import org.apache.ibatis.migration.ScriptRunner;
-import org.apache.ibatis.migration.MigrationException;
import org.apache.ibatis.adhoc.AdHocExecutor;
+import org.apache.ibatis.migration.*;
-import java.io.File;
-import java.io.FileReader;
-import java.util.*;
+import java.io.*;
import java.sql.SQLException;
+import java.util.*;
public class DownCommand extends BaseCommand {
@@ -18,7 +14,7 @@
}
public void execute(String... params) {
- try {
+ try {
Change lastChange = getLastAppliedChange();
List<Change> migrations = getMigrations();
Collections.reverse(migrations);
@@ -51,7 +47,6 @@
}
}
-
protected void reverse(Comparable[] comparable) {
Arrays.sort(comparable, new Comparator() {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/InitializeCommand.java Mon Aug 25 20:41:49 2008
@@ -3,7 +3,7 @@
import org.apache.ibatis.migration.MigrationException;
import java.io.File;
-import java.util.*;
+import java.util.Properties;
public class InitializeCommand extends BaseCommand {
@@ -20,13 +20,17 @@
createDirectoryIfNecessary(envPath);
createDirectoryIfNecessary(scriptPath);
createDirectoryIfNecessary(driverPath);
-
+
copyResourceTo("org/apache/ibatis/migration/template_README", baseFile("README"));
copyResourceTo("org/apache/ibatis/migration/template_environment.properties", environmentFile());
copyResourceTo("org/apache/ibatis/migration/template_bootstrap.sql", scriptFile("bootstrap.sql"));
copyResourceTo("org/apache/ibatis/migration/template_changelog.sql", scriptFile(getNextIDAsString() + "_create_changelog.sql"));
copyResourceTo("org/apache/ibatis/migration/template_migration.sql", scriptFile(getNextIDAsString() + "_first_migration.sql"),
- new Properties(){{setProperty("description","First migration.");}});
+ new Properties() {
+ {
+ setProperty("description", "First migration.");
+ }
+ });
out.println("Done!");
}
@@ -45,13 +49,12 @@
if (!path.exists()) {
File parent = new File(path.getParent());
createDirectoryIfNecessary(parent);
- out.println("Creating: " + path.getName());
+ out.println("Creating: " + path.getName());
if (!path.mkdir()) {
throw new MigrationException("Could not create directory path for an unknown reason. Make sure you have access to the directory.");
}
}
}
-
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/NewCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/NewCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/NewCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/NewCommand.java Mon Aug 25 20:41:49 2008
@@ -3,7 +3,7 @@
import org.apache.ibatis.migration.MigrationException;
import java.io.File;
-import java.util.*;
+import java.util.Properties;
public class NewCommand extends BaseCommand {
@@ -11,7 +11,7 @@
super(repository, environment, force);
}
- public void execute (String... params) {
+ public void execute(String... params) {
if (paramsEmpty(params)) {
throw new MigrationException("No description specified for new migration.");
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java Mon Aug 25 20:41:49 2008
@@ -2,8 +2,8 @@
import org.apache.ibatis.migration.Change;
-import java.util.*;
import java.io.File;
+import java.util.*;
public class StatusCommand extends BaseCommand {
@@ -30,7 +30,7 @@
} else {
merged.addAll(migrations);
}
- for(Change change : merged) {
+ for (Change change : merged) {
out.println(change);
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java Mon Aug 25 20:41:49 2008
@@ -1,23 +1,19 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.Change;
-import org.apache.ibatis.migration.MigrationReader;
-import org.apache.ibatis.migration.ScriptRunner;
-import org.apache.ibatis.migration.MigrationException;
import org.apache.ibatis.adhoc.AdHocExecutor;
+import org.apache.ibatis.migration.*;
-import java.io.File;
-import java.io.FileReader;
-import java.util.*;
+import java.io.*;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
+import java.util.List;
public class UpCommand extends BaseCommand {
private boolean runOneStepOnly = false;
public UpCommand(File repository, String environment, boolean force) {
- super(repository,environment,force);
+ super(repository, environment, force);
}
public UpCommand(File repository, String environment, boolean force, boolean runOneStepOnly) {
@@ -27,7 +23,7 @@
public void execute(String... params) {
try {
- Change lastChange = null;
+ Change lastChange = null;
if (changelogExists()) {
lastChange = getLastAppliedChange();
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java?rev=688953&r1=688952&r2=688953&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java Mon Aug 25 20:41:49 2008
@@ -21,21 +21,21 @@
Change change = getLastAppliedChange();
if (version.compareTo(change.getId()) > 0) {
- out.println("Upgrading to: " + version);
- Command up = new UpCommand(basePath,environment,force,true);
+ out.println("Upgrading to: " + version);
+ Command up = new UpCommand(basePath, environment, force, true);
while (!version.equals(change.getId())) {
up.execute();
change = getLastAppliedChange();
}
} else if (version.compareTo(change.getId()) < 0) {
out.println("Downgrading to: " + version);
- Command down = new DownCommand(basePath,environment,force);
+ Command down = new DownCommand(basePath, environment, force);
while (!version.equals(change.getId())) {
down.execute();
change = getLastAppliedChange();
}
} else {
- out.println("Already at version: " + version);
+ out.println("Already at version: " + version);
}
}