Skip to content

Commit b697060

Browse files
adrienlaueradrienlauer
committed
Update CLI handler to account for default option separator change
1 parent 99c5643 commit b697060

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

springbatch-support/src/it/java/org/seedstack/seed/springbatch/internal/SpringBatchCommandHandlerIT.java renamed to springbatch-support/src/it/java/org/seedstack/seed/springbatch/SpringBatchCommandHandlerIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
* License, v. 2.0. If a copy of the MPL was not distributed with this
88
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
99
*/
10-
package org.seedstack.seed.springbatch.internal;
10+
package org.seedstack.seed.springbatch;
1111

1212
import org.junit.Before;
13+
import org.junit.Test;
1314
import org.seedstack.seed.cli.api.WithCommandLine;
1415
import org.seedstack.seed.it.AbstractSeedIT;
15-
import org.junit.Test;
1616
import org.springframework.batch.core.repository.JobRepository;
1717

1818
import javax.inject.Inject;
@@ -37,21 +37,21 @@ public void before() {
3737
}
3838

3939
@Test
40-
@WithCommandLine(command = "run-job", value = {"--job", "flatFileJob", "-Pfile=fileTest.csv"}, expectedExitCode = 0)
40+
@WithCommandLine(command = "run-job", args = {"--job", "flatFileJob", "-Pfile=fileTest.csv"}, expectedExitCode = 0)
4141
public void execute_batch_without_error() {
4242
assertThat(passedBefore).isTrue();
4343
assertThat(jobRepository).isNotNull();
4444
}
4545

4646
@Test
47-
@WithCommandLine(command = "run-job", value = {"--job", "flatFileJob"}, expectedExitCode = 1)
47+
@WithCommandLine(command = "run-job", args = {"--job", "flatFileJob"}, expectedExitCode = 1)
4848
public void execute_batch_with_error() {
4949
assertThat(passedBefore).isTrue();
5050
assertThat(jobRepository).isNotNull();
5151
}
5252

5353
@Test
54-
@WithCommandLine(command = "run-job", value = {"-j", "flatFileJob", "-Pfile2=fileTest1", "--jobParameter", "file=fileTest.csv", "-P file3=fileTest2"}, expectedExitCode = 0)
54+
@WithCommandLine(command = "run-job", args = {"-j", "flatFileJob", "-Pfile2=fileTest1", "--jobParameter", "file=fileTest.csv", "-P file3=fileTest2"}, expectedExitCode = 0)
5555
public void execute_batch_with_multiple_parameters() {
5656
assertThat(passedBefore).isTrue();
5757
assertThat(jobRepository).isNotNull();

springbatch-support/src/it/java/org/seedstack/seed/springbatch/sample/DemoFlatFileItemReader.java renamed to springbatch-support/src/it/java/org/seedstack/seed/springbatch/fixtures/DemoFlatFileItemReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License, v. 2.0. If a copy of the MPL was not distributed with this
88
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
99
*/
10-
package org.seedstack.seed.springbatch.sample;
10+
package org.seedstack.seed.springbatch.fixtures;
1111

1212
import org.springframework.batch.item.file.FlatFileItemReader;
1313

springbatch-support/src/it/java/org/seedstack/seed/springbatch/sample/Employee.java renamed to springbatch-support/src/it/java/org/seedstack/seed/springbatch/fixtures/Employee.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License, v. 2.0. If a copy of the MPL was not distributed with this
88
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
99
*/
10-
package org.seedstack.seed.springbatch.sample;
10+
package org.seedstack.seed.springbatch.fixtures;
1111

1212
public class Employee {
1313

springbatch-support/src/it/java/org/seedstack/seed/springbatch/sample/EmployeeMapper.java renamed to springbatch-support/src/it/java/org/seedstack/seed/springbatch/fixtures/EmployeeMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License, v. 2.0. If a copy of the MPL was not distributed with this
88
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
99
*/
10-
package org.seedstack.seed.springbatch.sample;
10+
package org.seedstack.seed.springbatch.fixtures;
1111

1212
import org.springframework.batch.item.file.mapping.FieldSetMapper;
1313
import org.springframework.batch.item.file.transform.FieldSet;

springbatch-support/src/it/java/org/seedstack/seed/springbatch/sample/FlatFileBatchDemo.java renamed to springbatch-support/src/it/java/org/seedstack/seed/springbatch/fixtures/FlatFileBatchDemo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License, v. 2.0. If a copy of the MPL was not distributed with this
88
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
99
*/
10-
package org.seedstack.seed.springbatch.sample;
10+
package org.seedstack.seed.springbatch.fixtures;
1111

1212
import org.springframework.batch.core.*;
1313
import org.springframework.batch.core.launch.JobLauncher;

springbatch-support/src/it/java/org/seedstack/seed/springbatch/sample/SystemOutItemWriter.java renamed to springbatch-support/src/it/java/org/seedstack/seed/springbatch/fixtures/SystemOutItemWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License, v. 2.0. If a copy of the MPL was not distributed with this
88
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
99
*/
10-
package org.seedstack.seed.springbatch.sample;
10+
package org.seedstack.seed.springbatch.fixtures;
1111

1212
import org.springframework.batch.item.ItemWriter;
1313

‎springbatch-support/src/it/resources/META-INF/spring/flatFileJob-context.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
</bean>
5050
</property>
5151
<property name="fieldSetMapper">
52-
<bean class="org.seedstack.seed.springbatch.sample.EmployeeMapper" />
52+
<bean class="org.seedstack.seed.springbatch.fixtures.EmployeeMapper" />
5353
</property>
5454
</bean>
5555
</property>
5656
</bean>
5757

58-
<bean id="systemOutWriter" class="org.seedstack.seed.springbatch.sample.SystemOutItemWriter" />
58+
<bean id="systemOutWriter" class="org.seedstack.seed.springbatch.fixtures.SystemOutItemWriter" />
5959

6060
</beans>

‎springbatch-support/src/main/java/org/seedstack/seed/springbatch/internal/SpringBatchCommandLineHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class SpringBatchCommandLineHandler implements CommandLineHandler {
5858
@CliOption(name = "j", longName = "job", valueCount = 1, description = "Job name to launch")
5959
String optionJobName;
6060

61-
@CliOption(name = "P", longName = "jobParameter", valueCount = -1, description = "A job parameter")
61+
@CliOption(name = "P", longName = "jobParameter", valueCount = -1, valueSeparator = '=', description = "A job parameter")
6262
Map<String, String> optionJobParameters;
6363

6464
@Inject

0 commit comments

Comments
 (0)