Skip to content

Commit 3f46ed4

Browse files
harawataharawata
committed
Minor code optimizations.
1 parent 4b80f38 commit 3f46ed4

File tree

3 files changed

+67
-67
lines changed

3 files changed

+67
-67
lines changed

‎src/main/java/org/apache/ibatis/migration/FileMigrationLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2010-2017 the original author or authors.
2+
* Copyright 2010-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ protected boolean isSpecialFile(String filename) {
6666
protected Change parseChangeFromFilename(String filename) {
6767
try {
6868
Change change = new Change();
69-
int lastIndexOfDot = filename.lastIndexOf(".");
69+
int lastIndexOfDot = filename.lastIndexOf('.');
7070
String[] parts = filename.substring(0, lastIndexOfDot).split("_");
7171
change.setId(new BigDecimal(parts[0]));
7272
StringBuilder builder = new StringBuilder();

‎src/main/java/org/apache/ibatis/migration/hook/Jsr223HookScript.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2010-2017 the original author or authors.
2+
* Copyright 2010-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -108,7 +108,7 @@ public void execute(Map<String, Object> bindingMap) {
108108
if (functionName != null) {
109109
printStream.println(Util.horizontalLine("Invoking function : " + functionName, 80));
110110
invocable.invokeFunction(functionName, args.toArray());
111-
} else if (objectName != null && methodName != null) {
111+
} else {
112112
printStream.println(Util.horizontalLine("Invoking method : " + methodName, 80));
113113
Object targetObject = engine.get(objectName);
114114
invocable.invokeMethod(targetObject, methodName, args.toArray());

‎src/test/java/org/apache/ibatis/migration/MigratorTest.java

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,23 @@ private void testBootstrapCommand() throws Exception {
9898
out.clearLog();
9999
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "bootstrap", "--env=development"));
100100
String output = out.getLog();
101-
assertFalse(output.toString().contains("FAILURE"));
102-
assertTrue(output.toString().contains("-- // Bootstrap.sql"));
101+
assertFalse(output.contains("FAILURE"));
102+
assertTrue(output.contains("-- // Bootstrap.sql"));
103103
}
104104

105105
private void testStatusContainsNoPendingEntriesUsingStatusShorthand() throws Exception {
106106
out.clearLog();
107107
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "sta"));
108108
String output = out.getLog();
109-
assertFalse(output.toString().contains("FAILURE"));
110-
assertTrue(output.toString().contains("...pending..."));
109+
assertFalse(output.contains("FAILURE"));
110+
assertTrue(output.contains("...pending..."));
111111
}
112112

113113
private void testUpCommandWithSpecifiedSteps() throws Exception {
114114
out.clearLog();
115115
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "up", "3000"));
116116
String output = out.getLog();
117-
assertFalse(output.toString().contains("FAILURE"));
117+
assertFalse(output.contains("FAILURE"));
118118
}
119119

120120
private void assertAuthorEmailContainsPlaceholder() throws Exception {
@@ -134,30 +134,30 @@ private void testDownCommandGiven2Steps() throws Exception {
134134
out.clearLog();
135135
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "down", "2"));
136136
String output = out.getLog();
137-
assertFalse(output.toString().contains("FAILURE"));
137+
assertFalse(output.contains("FAILURE"));
138138
}
139139

140140
private void testDoPendingScriptCommand() throws Exception {
141141
out.clearLog();
142142
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "script", "pending"));
143143
String output = out.getLog();
144-
assertTrue(output.toString().contains("INSERT"));
145-
assertTrue(output.toString().contains("CHANGELOG"));
146-
assertFalse(output.toString().contains("-- @UNDO"));
144+
assertTrue(output.contains("INSERT"));
145+
assertTrue(output.contains("CHANGELOG"));
146+
assertFalse(output.contains("-- @UNDO"));
147147

148148
out.clearLog();
149149
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "script", "pending_undo"));
150150
output = out.getLog();
151-
assertTrue(output.toString().contains("DELETE"));
152-
assertTrue(output.toString().contains("CHANGELOG"));
153-
assertTrue(output.toString().contains("-- @UNDO"));
151+
assertTrue(output.contains("DELETE"));
152+
assertTrue(output.contains("CHANGELOG"));
153+
assertTrue(output.contains("-- @UNDO"));
154154
}
155155

156156
private void testVersionCommand() throws Exception {
157157
out.clearLog();
158158
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "version", "20080827200217"));
159159
String output = out.getLog();
160-
assertFalse(output.toString().contains("FAILURE"));
160+
assertFalse(output.contains("FAILURE"));
161161
}
162162

163163
private void testSkippedScript() throws Exception {
@@ -167,9 +167,9 @@ private void testSkippedScript() throws Exception {
167167
try {
168168
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "up"));
169169
String output = out.getLog();
170-
assertFalse(output.toString().contains("FAILURE"));
170+
assertFalse(output.contains("FAILURE"));
171171
assertEquals(1, TestUtil.countStr(output, "WARNING"));
172-
assertTrue(output.toString().contains(
172+
assertTrue(output.contains(
173173
"WARNING: Migration script '20080827200215_skipped_migration.sql' was not applied to the database."));
174174
} finally {
175175
skipped.delete();
@@ -184,9 +184,9 @@ private void testMissingScript() throws Exception {
184184
try {
185185
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "up"));
186186
String output = out.getLog();
187-
assertFalse(output.toString().contains("FAILURE"));
188-
assertTrue(output.toString()
189-
.contains("WARNING: Missing migration script. id='20080827200216', description='create procs'."));
187+
assertFalse(output.contains("FAILURE"));
188+
assertTrue(
189+
output.contains("WARNING: Missing migration script. id='20080827200216', description='create procs'."));
190190
} finally {
191191
assertTrue(renamed.renameTo(original));
192192
}
@@ -196,90 +196,90 @@ private void testDownCommand() throws Exception {
196196
out.clearLog();
197197
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "down"));
198198
String output = out.getLog();
199-
assertFalse(output.toString().contains("FAILURE"));
199+
assertFalse(output.contains("FAILURE"));
200200
}
201201

202202
private void testStatusContainsPendingMigrations() throws Exception {
203203
out.clearLog();
204204
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "status"));
205205
String output = out.getLog();
206-
assertFalse(output.toString().contains("FAILURE"));
207-
assertTrue(output.toString().contains("...pending..."));
206+
assertFalse(output.contains("FAILURE"));
207+
assertTrue(output.contains("...pending..."));
208208
}
209209

210210
private void testPendingCommand() throws Exception {
211211
out.clearLog();
212212
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "pending"));
213213
String output = out.getLog();
214-
assertFalse(output.toString().contains("FAILURE"));
214+
assertFalse(output.contains("FAILURE"));
215215
}
216216

217217
private void testStatusContainsNoPendingMigrations() throws Exception {
218218
out.clearLog();
219219
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "status"));
220220
String output = out.getLog();
221-
assertFalse(output.toString().contains("FAILURE"));
222-
assertFalse(output.toString().contains("...pending..."));
221+
assertFalse(output.contains("FAILURE"));
222+
assertFalse(output.contains("...pending..."));
223223
}
224224

225225
private void testHelpCommand() throws Exception {
226226
out.clearLog();
227227
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "--help"));
228228
String output = out.getLog();
229-
assertFalse(output.toString().contains("FAILURE"));
230-
assertTrue(output.toString().contains("--help"));
229+
assertFalse(output.contains("FAILURE"));
230+
assertTrue(output.contains("--help"));
231231
}
232232

233233
private void testDoScriptCommand() throws Exception {
234234
out.clearLog();
235235
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "script", "20080827200212", "20080827200214"));
236236
String output = out.getLog();
237-
assertFalse(output.toString().contains("FAILURE"));
238-
assertFalse(output.toString().contains("20080827200210"));
239-
assertFalse(output.toString().contains("20080827200211"));
240-
assertFalse(output.toString().contains("20080827200212"));
241-
assertTrue(output.toString().contains("20080827200213"));
242-
assertTrue(output.toString().contains("20080827200214"));
243-
assertFalse(output.toString().contains("20080827200216"));
244-
assertFalse(output.toString().contains("-- @UNDO"));
237+
assertFalse(output.contains("FAILURE"));
238+
assertFalse(output.contains("20080827200210"));
239+
assertFalse(output.contains("20080827200211"));
240+
assertFalse(output.contains("20080827200212"));
241+
assertTrue(output.contains("20080827200213"));
242+
assertTrue(output.contains("20080827200214"));
243+
assertFalse(output.contains("20080827200216"));
244+
assertFalse(output.contains("-- @UNDO"));
245245

246246
out.clearLog();
247247
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "script", "0", "20080827200211"));
248248
output = out.getLog();
249-
assertFalse(output.toString().contains("FAILURE"));
250-
assertTrue(output.toString().contains("20080827200210"));
251-
assertTrue(output.toString().contains("20080827200211"));
252-
assertFalse(output.toString().contains("20080827200212"));
253-
assertFalse(output.toString().contains("20080827200213"));
254-
assertFalse(output.toString().contains("20080827200214"));
255-
assertFalse(output.toString().contains("20080827200216"));
256-
assertFalse(output.toString().contains("-- @UNDO"));
249+
assertFalse(output.contains("FAILURE"));
250+
assertTrue(output.contains("20080827200210"));
251+
assertTrue(output.contains("20080827200211"));
252+
assertFalse(output.contains("20080827200212"));
253+
assertFalse(output.contains("20080827200213"));
254+
assertFalse(output.contains("20080827200214"));
255+
assertFalse(output.contains("20080827200216"));
256+
assertFalse(output.contains("-- @UNDO"));
257257
}
258258

259259
private void testUndoScriptCommand() throws Exception {
260260
out.clearLog();
261261
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "script", "20080827200216", "20080827200213"));
262262
String output = out.getLog();
263-
assertFalse(output.toString().contains("FAILURE"));
264-
assertFalse(output.toString().contains("20080827200210"));
265-
assertFalse(output.toString().contains("20080827200211"));
266-
assertFalse(output.toString().contains("20080827200212"));
267-
assertFalse(output.toString().contains("20080827200213"));
268-
assertTrue(output.toString().contains("20080827200214"));
269-
assertTrue(output.toString().contains("20080827200216"));
270-
assertTrue(output.toString().contains("-- @UNDO"));
263+
assertFalse(output.contains("FAILURE"));
264+
assertFalse(output.contains("20080827200210"));
265+
assertFalse(output.contains("20080827200211"));
266+
assertFalse(output.contains("20080827200212"));
267+
assertFalse(output.contains("20080827200213"));
268+
assertTrue(output.contains("20080827200214"));
269+
assertTrue(output.contains("20080827200216"));
270+
assertTrue(output.contains("-- @UNDO"));
271271
out.clearLog();
272272

273273
Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "script", "20080827200211", "0"));
274274
output = out.getLog();
275-
assertFalse(output.toString().contains("FAILURE"));
276-
assertTrue(output.toString().contains("20080827200210"));
277-
assertTrue(output.toString().contains("20080827200211"));
278-
assertFalse(output.toString().contains("20080827200212"));
279-
assertFalse(output.toString().contains("20080827200213"));
280-
assertFalse(output.toString().contains("20080827200214"));
281-
assertFalse(output.toString().contains("20080827200216"));
282-
assertTrue(output.toString().contains("-- @UNDO"));
275+
assertFalse(output.contains("FAILURE"));
276+
assertTrue(output.contains("20080827200210"));
277+
assertTrue(output.contains("20080827200211"));
278+
assertFalse(output.contains("20080827200212"));
279+
assertFalse(output.contains("20080827200213"));
280+
assertFalse(output.contains("20080827200214"));
281+
assertFalse(output.contains("20080827200216"));
282+
assertTrue(output.contains("-- @UNDO"));
283283
}
284284

285285
@Test
@@ -288,7 +288,7 @@ public void shouldScriptCommandFailIfSameVersion() throws Exception {
288288
exit.checkAssertionAfterwards(new Assertion() {
289289
public void checkAssertion() {
290290
String output = out.getLog();
291-
assertTrue(output.toString().contains("FAILURE"));
291+
assertTrue(output.contains("FAILURE"));
292292
}
293293
});
294294
out.clearLog();
@@ -379,7 +379,7 @@ public void useCustomTemplateWithBadPath() throws Exception {
379379
Migrator.main(TestUtil.args("--path=" + basePath.getAbsolutePath(), "new", "test new migration"));
380380
String output = out.getLog();
381381
assertEquals(4, scriptPath.list().length);
382-
assertTrue(output.toString()
382+
assertTrue(output
383383
.contains("Your migrations configuration did not find your custom template. Using the default template."));
384384
}
385385

@@ -390,7 +390,7 @@ public void shouldSuppressOutputIfQuietOptionEnabled() throws Throwable {
390390
out.clearLog();
391391
Migrator.main(TestUtil.args("--path=" + basePath.getAbsolutePath(), "--quiet", "init"));
392392
String output = out.getLog();
393-
assertFalse(output.toString().contains("Initializing:"));
393+
assertFalse(output.contains("Initializing:"));
394394
assertNotNull(basePath.list());
395395
}
396396

@@ -401,7 +401,7 @@ public void shouldColorizeSuccessOutputIfColorOptionEnabled() throws Throwable {
401401
out.clearLog();
402402
Migrator.main(TestUtil.args("--path=" + basePath.getAbsolutePath(), "--color", "init"));
403403
String output = out.getLog();
404-
assertTrue(output.toString().contains(ConsoleColors.GREEN + "SUCCESS"));
404+
assertTrue(output.contains(ConsoleColors.GREEN + "SUCCESS"));
405405
assertNotNull(basePath.list());
406406
}
407407

@@ -411,7 +411,7 @@ public void shouldColorizeFailureOutputIfColorOptionEnabled() throws Throwable {
411411
exit.checkAssertionAfterwards(new Assertion() {
412412
public void checkAssertion() {
413413
String output = out.getLog();
414-
assertTrue(output.toString().contains(ConsoleColors.RED + "FAILURE"));
414+
assertTrue(output.contains(ConsoleColors.RED + "FAILURE"));
415415
}
416416
});
417417
System.setProperty("migrationsHome", "/tmp");

0 commit comments

Comments
 (0)