From ccb2467cced35be44a565119a8dc3ca26ae5f257 Mon Sep 17 00:00:00 2001 From: trisberg Date: Fri, 1 Aug 2008 00:50:13 +0000 Subject: [PATCH] IN PROGRESS - BATCH-672: removed redundant casts and boxing/unboxing, converted to for each loops, general cleanup --- ...nfigurableSystemProcessExitCodeMapper.java | 4 ++-- .../common/FieldSetResultSetExtractor.java | 6 +++--- .../batch/sample/common/LogAdvice.java | 20 +++++++++---------- .../sample/common/StagingItemWriter.java | 2 +- .../order/internal/OrderItemReader.java | 2 +- .../order/internal/OrderTransformer.java | 2 +- .../internal/valang/FutureDateFunction.java | 8 ++------ .../valang/TotalOrderItemsFunction.java | 11 +++++----- .../sample/domain/person/PersonService.java | 2 +- .../domain/person/internal/PersonWriter.java | 6 +----- .../batch/sample/domain/trade/TradeDao.java | 2 +- .../JobExecutionNotificationPublisher.java | 1 - .../jmx/SimpleMessageApplicationEvent.java | 4 ---- .../StepExecutionApplicationEventAdvice.java | 8 ++------ .../batch/sample/launch/DefaultJobLoader.java | 8 +++----- .../sample/quartz/JobLauncherDetails.java | 6 +++--- .../sample/tasklet/FileDeletingTasklet.java | 6 +++--- .../sample/TaskletJobFunctionalTests.java | 2 +- ...rableSystemProcessExitCodeMapperTests.java | 1 - ...impleSystemProcessExitCodeMapperTests.java | 1 - .../SystemCommandTaskletIntegrationTests.java | 3 --- .../internal/JdbcGameDaoIntegrationTests.java | 1 - .../order/AddressFieldSetMapperTests.java | 1 - .../order/BillingFieldSetMapperTests.java | 1 - .../order/CustomerFieldSetMapperTests.java | 1 - .../order/FlatFileOrderWriterTests.java | 5 ----- .../order/HeaderFieldSetMapperTests.java | 1 - .../order/OrderItemFieldSetMapperTests.java | 1 - .../domain/order/OrderItemReaderTests.java | 6 ------ .../domain/order/OrderTransformerTests.java | 5 ----- .../order/ShippingFieldSetMapperTests.java | 1 - .../valang/FutureDateFunctionTests.java | 1 - .../valang/TotalOrderItemsFunctionTests.java | 1 - .../ValidateDiscountsFunctionTests.java | 1 - .../ValidateHandlingPricesFunctionTests.java | 1 - .../valang/ValidateIdsFunctionTests.java | 1 - .../valang/ValidatePricesFunctionTests.java | 1 - .../ValidateQuantitiesFunctionTests.java | 1 - .../ValidateShippingPricesFunctionTests.java | 1 - .../ValidateTotalPricesFunctionTests.java | 1 - .../CustomerCreditIncreaseProcessorTests.java | 3 +-- ...ditUpdatePreparedStatementSetterTests.java | 4 +--- .../CustomerUpdateProcessorTests.java | 1 - .../internal/GeneratingItemReaderTests.java | 3 +-- .../internal/JdbcCustomerDebitDaoTests.java | 1 - .../internal/TradeFieldSetMapperTests.java | 3 +-- ...obExecutionNotificationPublisherTests.java | 2 -- .../sample/launch/RemoteLauncherTests.java | 16 ++------------- .../batch/sample/support/JobSupport.java | 7 ++++++- .../support/RetrySampleItemWriterTests.java | 3 +-- .../batch/sample/support/StepSupport.java | 8 -------- 51 files changed, 53 insertions(+), 135 deletions(-) diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapper.java index 0841f2a51..72f35b4d4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapper.java @@ -20,11 +20,11 @@ public class ConfigurableSystemProcessExitCodeMapper implements SystemProcessExi private Map mappings; public ExitStatus getExitStatus(int exitCode) { - ExitStatus exitStatus = (ExitStatus) mappings.get(new Integer(exitCode)); + ExitStatus exitStatus = mappings.get(exitCode); if (exitStatus != null) { return exitStatus; } else { - return (ExitStatus) mappings.get(ELSE_KEY); + return mappings.get(ELSE_KEY); } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/FieldSetResultSetExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/FieldSetResultSetExtractor.java index 697bbfbed..236b949d2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/FieldSetResultSetExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/FieldSetResultSetExtractor.java @@ -41,13 +41,13 @@ public final class FieldSetResultSetExtractor { * Processes single row in ResultSet and returns its FieldSet representation. * @param rs ResultSet ResultSet to extract data from. * @return FieldSet representation of current row in ResultSet - * @throws SQLException + * @throws SQLException thrown during processing */ public static FieldSet getFieldSet(ResultSet rs) throws SQLException { ResultSetMetaData metaData = rs.getMetaData(); int columnCount = metaData.getColumnCount(); - FieldSet fs = null; + FieldSet fs; List tokens = new ArrayList(); List names = new ArrayList(); @@ -57,7 +57,7 @@ public final class FieldSetResultSetExtractor { names.add(metaData.getColumnName(i)); } - fs = new DefaultFieldSet((String[])tokens.toArray(new String[0]), (String[])names.toArray(new String[0])); + fs = new DefaultFieldSet(tokens.toArray(new String[0]), names.toArray(new String[0])); return fs; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java index 21522e929..aa29fb202 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/LogAdvice.java @@ -31,22 +31,22 @@ public class LogAdvice { private static Log log = LogFactory.getLog(LogAdvice.class); - /** + /* * Wraps original method and adds logging both before and after method */ public void doBasicLogging(JoinPoint pjp) throws Throwable { Object[] args = pjp.getArgs(); StringBuffer output = new StringBuffer(); - - output.append(pjp.getTarget().getClass().getName()+": "); - output.append(pjp.toShortString()+": "); - for(int i = 0; i < args.length; i++){ - output.append(args[i] + " "); - } - - - log.info("Basic: " + output.toString()); + output.append(pjp.getTarget().getClass().getName()).append(": "); + output.append(pjp.toShortString()).append(": "); + + for (Object arg : args) { + output.append(arg).append(" "); + } + + + log.info("Basic: " + output.toString()); } public void doStronglyTypedLogging(Object item){ diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java index e97cea975..c64677390 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemWriter.java @@ -72,7 +72,7 @@ public class StagingItemWriter extends JdbcDaoSupport implements StepExecutio */ public void write(T data) { final long id = incrementer.nextLongValue(); - final long jobId = stepExecution.getJobExecution().getJobId().longValue(); + final long jobId = stepExecution.getJobExecution().getJobId(); final byte[] blob = SerializationUtils.serialize((Serializable) data); getJdbcTemplate().update("INSERT into BATCH_STAGING (ID, JOB_ID, VALUE, PROCESSED) values (?,?,?,?)", new PreparedStatementSetter() { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java index 6c13b1283..c43ec24a3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java @@ -64,7 +64,7 @@ public class OrderItemReader extends AbstractItemReader { recordFinished = false; while (!recordFinished) { - process((FieldSet) fieldSetReader.read()); + process(fieldSetReader.read()); } log.info("Mapped: " + order); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderTransformer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderTransformer.java index ed6962bf1..2923159ff 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderTransformer.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderTransformer.java @@ -71,7 +71,7 @@ public class OrderTransformer implements ItemTransformer> { } private LineAggregator getAggregator(String name) { - return (LineAggregator) aggregators.get(name); + return aggregators.get(name); } /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunction.java index 3e05664d4..47cb1a2c0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunction.java @@ -27,11 +27,7 @@ import org.springmodules.validation.valang.functions.Function; * @author peter.zozom */ public class FutureDateFunction extends AbstractFunction { - /** - * @param arguments - * @param line - * @param column - */ + public FutureDateFunction(Function[] arguments, int line, int column) { super(arguments, line, column); definedExactNumberOfArguments(1); @@ -44,7 +40,7 @@ public class FutureDateFunction extends AbstractFunction { //get argument final Object value = getArguments()[0].getResult(target); - Boolean result = Boolean.FALSE; + Boolean result; if (value instanceof Date) { final Date now = new Date(System.currentTimeMillis()); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunction.java index c55d032b7..b541c37ad 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunction.java @@ -16,7 +16,6 @@ package org.springframework.batch.sample.domain.order.internal.valang; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.order.LineItem; @@ -41,7 +40,7 @@ public class TotalOrderItemsFunction extends AbstractFunction { @SuppressWarnings("unchecked") protected Object doGetResult(Object target) throws Exception { //get arguments - int count = ((Integer) getArguments()[0].getResult(target)).intValue(); + int count = (Integer) getArguments()[0].getResult(target); Object value = getArguments()[1].getResult(target); Boolean result; @@ -50,11 +49,11 @@ public class TotalOrderItemsFunction extends AbstractFunction { if (value instanceof List) { int totalItems = 0; - for (Iterator i = ((List) value).iterator(); i.hasNext();) { - totalItems += i.next().getQuantity(); - } + for (LineItem lineItem : ((List) value)) { + totalItems += lineItem.getQuantity(); + } - result = (totalItems == count) ? Boolean.TRUE : Boolean.FALSE; + result = (totalItems == count) ? Boolean.TRUE : Boolean.FALSE; } else { throw new Exception("No list for validation"); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java index ec52842af..364640faa 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java @@ -62,7 +62,7 @@ public class PersonService { return person; } - /** + /* * Badly designed method signature which accepts multiple implicitly related * arguments instead of a single Person argument. */ diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java index 7273c9d1e..595d1c598 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java @@ -27,13 +27,9 @@ public class PersonWriter extends AbstractItemWriter { private static Log log = LogFactory.getLog(PersonWriter.class); public void write(Person data) { - if (!(data instanceof Person)) { - log.warn("PersonProcessor can process only Person objects, skipping record"); - - return; - } log.debug("Processing: " + data); + } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java index ad9f95787..2eddfb363 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java @@ -23,7 +23,7 @@ package org.springframework.batch.sample.domain.trade; * @author Robert Kasanicky */ public interface TradeDao { - /** + /* * Write a trade object to some kind of output, different implementations * can write to file, database etc. */ diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisher.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisher.java index 1fd3658e7..98a55e09a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisher.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisher.java @@ -61,7 +61,6 @@ public class JobExecutionNotificationPublisher implements ApplicationListener, N logger.info(message); publish(message); } - return; } /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/SimpleMessageApplicationEvent.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/SimpleMessageApplicationEvent.java index e9e8034d7..e2f942143 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/SimpleMessageApplicationEvent.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/SimpleMessageApplicationEvent.java @@ -10,10 +10,6 @@ public class SimpleMessageApplicationEvent extends ApplicationEvent { private String message; - /** - * @param source - * @param message - */ public SimpleMessageApplicationEvent(Object source, String message) { super(source); this.message = message; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/StepExecutionApplicationEventAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/StepExecutionApplicationEventAdvice.java index 404a975e2..1037286aa 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/StepExecutionApplicationEventAdvice.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/jmx/StepExecutionApplicationEventAdvice.java @@ -55,13 +55,9 @@ public class StepExecutionApplicationEventAdvice implements ApplicationEventPubl publish(jp.getTarget(), msg); } - /** - * Publish a {@link RepeatOperationsApplicationEvent} with the given + /* + * Publish a {@link SimpleMessageApplicationEvent} with the given * parameters. - * - * @param context the current batch context - * @param message the message to publish - * @param type the type of event to publish */ private void publish(Object source, String message) { applicationEventPublisher.publishEvent(new SimpleMessageApplicationEvent(source, message)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java index 1bac33284..50d167796 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/DefaultJobLoader.java @@ -37,7 +37,7 @@ public class DefaultJobLoader implements JobLoader, ApplicationContextAware { Map result = new HashMap(configurations); for (String jobName : registry.getJobNames()) { try { - Job configuration = (Job) registry.getJob(jobName); + Job configuration = registry.getJob(jobName); String name = configuration.getName(); if (!configurations.containsKey(name)) { result.put(name, ": " + configuration); @@ -54,8 +54,7 @@ public class DefaultJobLoader implements JobLoader, ApplicationContextAware { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { path }, applicationContext); String[] names = context.getBeanNamesForType(Job.class); - for (int i = 0; i < names.length; i++) { - String name = names[i]; + for (String name : names) { configurations.put(name, path); } } @@ -88,8 +87,7 @@ public class DefaultJobLoader implements JobLoader, ApplicationContextAware { String name = path.substring(0, index); Object bean = getJobConfiguration(name); Assert.notNull(bean, "No JobConfiguration exists with name=" + name); - BeanWrapperImpl wrapper = new BeanWrapperImpl(bean); - return wrapper; + return new BeanWrapperImpl(bean); } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java index b094b5217..0e3b00cc4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java @@ -76,7 +76,7 @@ public class JobLauncherDetails extends QuartzJobBean { } } - /** + /* * Copy parameters that are of the correct type over to * {@link JobParameters}, ignoring jobName. * @@ -93,10 +93,10 @@ public class JobLauncherDetails extends QuartzJobBean { builder.addString(key, (String) value); } else if (value instanceof Float || value instanceof Double) { - builder.addDouble(key, (Double) value); + builder.addDouble(key, ((Number) value).doubleValue()); } else if (value instanceof Integer || value instanceof Long) { - builder.addLong(key, (Long) value); + builder.addLong(key, ((Number)value).longValue()); } else if (value instanceof Date) { builder.addDate(key, (Date) value); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/FileDeletingTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/FileDeletingTasklet.java index 2affdd502..59bd5f29e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/FileDeletingTasklet.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/FileDeletingTasklet.java @@ -24,10 +24,10 @@ public class FileDeletingTasklet implements Tasklet, InitializingBean { Assert.state(dir.isDirectory()); File[] files = dir.listFiles(); - for (int i = 0; i < files.length; i++) { - boolean deleted = files[i].delete(); + for (File file : files) { + boolean deleted = file.delete(); if (!deleted) { - throw new UnexpectedJobExecutionException("Could not delete file " + files[i].getPath()); + throw new UnexpectedJobExecutionException("Could not delete file " + file.getPath()); } } return ExitStatus.FINISHED; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java index fa82ab4cd..09722a128 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java @@ -22,7 +22,7 @@ public class TaskletJobFunctionalTests extends AbstractValidatingBatchLauncherTe @Autowired private Resource directory; - /** + /* * Create the directory and some files in it. */ @Before diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapperTests.java index ba2953aa2..e494bc33e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapperTests.java @@ -8,7 +8,6 @@ import java.util.Map; import org.junit.Test; import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.sample.common.ConfigurableSystemProcessExitCodeMapper; /** * Tests for {@link ConfigurableSystemProcessExitCodeMapper} diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SimpleSystemProcessExitCodeMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SimpleSystemProcessExitCodeMapperTests.java index 8072ee293..b64addd43 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SimpleSystemProcessExitCodeMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SimpleSystemProcessExitCodeMapperTests.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.sample.common.SimpleSystemProcessExitCodeMapper; /** * Tests for {@link SimpleSystemProcessExitCodeMapper}. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SystemCommandTaskletIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SystemCommandTaskletIntegrationTests.java index 5a2239615..1493268ba 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SystemCommandTaskletIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SystemCommandTaskletIntegrationTests.java @@ -16,9 +16,6 @@ import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.sample.common.SystemCommandException; -import org.springframework.batch.sample.common.SystemCommandTasklet; -import org.springframework.batch.sample.common.SystemProcessExitCodeMapper; import org.springframework.util.Assert; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java index 4f96a2bb8..2906f25e9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java @@ -26,7 +26,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.batch.sample.domain.football.Game; -import org.springframework.batch.sample.domain.football.internal.JdbcGameDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.simple.ParameterizedRowMapper; import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java index bedcaffb6..e1564c2ec 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java @@ -3,7 +3,6 @@ package org.springframework.batch.sample.domain.order; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.order.Address; import org.springframework.batch.sample.domain.order.internal.AddressFieldSetMapper; import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java index 645e15057..7a4fc5fa3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java @@ -3,7 +3,6 @@ package org.springframework.batch.sample.domain.order; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.order.BillingInfo; import org.springframework.batch.sample.domain.order.internal.BillingFieldSetMapper; import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java index d034cfe46..f5ba81522 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java @@ -3,7 +3,6 @@ package org.springframework.batch.sample.domain.order; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.order.Customer; import org.springframework.batch.sample.domain.order.internal.CustomerFieldSetMapper; import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java index 10c15a1d2..d5f156dc8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/FlatFileOrderWriterTests.java @@ -32,11 +32,6 @@ import org.springframework.batch.item.file.transform.LineAggregator; import org.springframework.batch.item.support.AbstractItemWriter; import org.springframework.batch.item.transform.ItemTransformerItemWriter; import org.springframework.batch.sample.StubLineAggregator; -import org.springframework.batch.sample.domain.order.Address; -import org.springframework.batch.sample.domain.order.BillingInfo; -import org.springframework.batch.sample.domain.order.Customer; -import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.Order; import org.springframework.batch.sample.domain.order.internal.OrderTransformer; public class FlatFileOrderWriterTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java index f5ce3a728..396820566 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java @@ -5,7 +5,6 @@ import java.util.Calendar; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.order.Order; import org.springframework.batch.sample.domain.order.internal.HeaderFieldSetMapper; import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java index 07e740db9..eca5538cc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java @@ -5,7 +5,6 @@ import java.math.BigDecimal; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.order.LineItem; import org.springframework.batch.sample.domain.order.internal.OrderItemFieldSetMapper; import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java index 9ccd192b4..d95a42d46 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java @@ -18,12 +18,6 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.order.Address; -import org.springframework.batch.sample.domain.order.BillingInfo; -import org.springframework.batch.sample.domain.order.Customer; -import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.Order; -import org.springframework.batch.sample.domain.order.ShippingInfo; import org.springframework.batch.sample.domain.order.internal.OrderItemReader; public class OrderItemReaderTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java index ff1eb9edc..ea61be8f5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderTransformerTests.java @@ -26,11 +26,6 @@ import java.util.HashMap; import org.junit.Test; import org.springframework.batch.item.file.transform.DelimitedLineAggregator; import org.springframework.batch.item.file.transform.LineAggregator; -import org.springframework.batch.sample.domain.order.Address; -import org.springframework.batch.sample.domain.order.BillingInfo; -import org.springframework.batch.sample.domain.order.Customer; -import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.Order; import org.springframework.batch.sample.domain.order.internal.OrderTransformer; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java index 3cef39e24..b29675a31 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java @@ -3,7 +3,6 @@ package org.springframework.batch.sample.domain.order; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.order.ShippingInfo; import org.springframework.batch.sample.domain.order.internal.ShippingFieldSetMapper; import org.springframework.batch.sample.support.AbstractFieldSetMapperTests; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunctionTests.java index 0b742dd89..89ffac630 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/FutureDateFunctionTests.java @@ -11,7 +11,6 @@ import java.util.Date; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.domain.order.internal.valang.FutureDateFunction; import org.springmodules.validation.valang.functions.Function; public class FutureDateFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunctionTests.java index 256b40164..044de8c62 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/TotalOrderItemsFunctionTests.java @@ -13,7 +13,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.TotalOrderItemsFunction; import org.springmodules.validation.valang.functions.Function; public class TotalOrderItemsFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunctionTests.java index 8a8af22b9..55365f172 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateDiscountsFunctionTests.java @@ -13,7 +13,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.ValidateDiscountsFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateDiscountsFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunctionTests.java index 989e68eb7..b3eae5c15 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateHandlingPricesFunctionTests.java @@ -13,7 +13,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.ValidateHandlingPricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateHandlingPricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunctionTests.java index be328ecfb..ab7b530bd 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateIdsFunctionTests.java @@ -12,7 +12,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.ValidateIdsFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateIdsFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunctionTests.java index 09f1312cf..49452fdbc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidatePricesFunctionTests.java @@ -13,7 +13,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.ValidatePricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidatePricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunctionTests.java index 565dde518..0595fe2fd 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateQuantitiesFunctionTests.java @@ -12,7 +12,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.ValidateQuantitiesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateQuantitiesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunctionTests.java index b8d6738f9..0011f8b7d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateShippingPricesFunctionTests.java @@ -13,7 +13,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.ValidateShippingPricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateShippingPricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunctionTests.java index 5f23b4474..261e89081 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/valang/ValidateTotalPricesFunctionTests.java @@ -14,7 +14,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.internal.valang.ValidateTotalPricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateTotalPricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java index 6a56a0405..9f7ad8502 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java @@ -7,7 +7,6 @@ import java.math.BigDecimal; import org.junit.Test; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.sample.domain.trade.CustomerCreditDao; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseWriter; /** * Tests for {@link CustomerCreditIncreaseWriter}. @@ -18,7 +17,7 @@ public class CustomerCreditIncreaseProcessorTests { private CustomerCreditIncreaseWriter writer = new CustomerCreditIncreaseWriter(); - /** + /* * Increases customer's credit by fixed value */ @Test diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java index d31d0a760..50c3ce924 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java @@ -23,7 +23,6 @@ import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdatePreparedStatementSetter; /** * @author Dave Syer @@ -46,9 +45,8 @@ public class CustomerCreditUpdatePreparedStatementSetterTests { credit.setName("foo"); } - /** + /* * Test method for {@link org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) } - * @throws SQLException */ @Test public void testSetValues() throws SQLException { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java index b06385c57..5b7149471 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java @@ -8,7 +8,6 @@ import org.junit.Test; import org.springframework.batch.sample.domain.trade.CustomerDebit; import org.springframework.batch.sample.domain.trade.CustomerDebitDao; import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.internal.CustomerUpdateWriter; public class CustomerUpdateProcessorTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java index 7bcd119db..489b5a79a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java @@ -3,7 +3,6 @@ package org.springframework.batch.sample.domain.trade.internal; import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader; /** * Tests for {@link GeneratingTradeItemReader}. @@ -14,7 +13,7 @@ public class GeneratingItemReaderTests { private GeneratingTradeItemReader reader = new GeneratingTradeItemReader(); - /** + /* * Generates a given number of not-null records, * consecutive calls return null. */ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java index 00181826c..ab6edc85b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java @@ -26,7 +26,6 @@ import javax.sql.DataSource; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.batch.sample.domain.trade.CustomerDebit; -import org.springframework.batch.sample.domain.trade.internal.JdbcCustomerDebitDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java index 908480d8f..e2afa4ec6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java @@ -38,8 +38,7 @@ public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests { } protected FieldSetMapper fieldSetMapper() { - FieldSetMapper mapper = new TradeFieldSetMapper(); - return mapper; + return new TradeFieldSetMapper(); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java index bca4891a4..f4255a466 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java @@ -24,8 +24,6 @@ import java.util.List; import javax.management.Notification; import org.junit.Test; -import org.springframework.batch.sample.jmx.JobExecutionNotificationPublisher; -import org.springframework.batch.sample.jmx.SimpleMessageApplicationEvent; import org.springframework.jmx.export.notification.NotificationPublisher; import org.springframework.jmx.export.notification.UnableToSendNotificationException; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java index ef20cbcf8..3b47c79ab 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java @@ -46,8 +46,6 @@ public class RemoteLauncherTests { private static List errors = new ArrayList(); - private static Thread thread; - private static ExportedJobLauncher launcher; private static JobLoader loader; @@ -89,7 +87,7 @@ public class RemoteLauncherTests { return; } System.setProperty("com.sun.management.jmxremote", ""); - thread = new Thread(new Runnable() { + Thread thread = new Thread(new Runnable() { public void run() { try { JobRegistryBackgroundJobRunner.main("adhoc-job-launcher-context.xml", "jobs/adhocLoopJob.xml"); @@ -106,14 +104,10 @@ public class RemoteLauncherTests { } } - /** - * @throws Exception - * - */ private static boolean isConnected() throws Exception { boolean connected = false; if (!JobRegistryBackgroundJobRunner.getErrors().isEmpty()) { - throw (RuntimeException) JobRegistryBackgroundJobRunner.getErrors().get(0); + throw JobRegistryBackgroundJobRunner.getErrors().get(0); } if (launcher == null) { MBeanServerConnectionFactoryBean connectionFactory = new MBeanServerConnectionFactoryBean(); @@ -138,12 +132,6 @@ public class RemoteLauncherTests { return connected; } - /** - * @param connectionFactory - * @param objectName - * @param interfaceType - * @throws MalformedObjectNameException - */ private static Object getMBean(MBeanServerConnectionFactoryBean connectionFactory, String objectName, Class interfaceType) throws MalformedObjectNameException { MBeanProxyFactoryBean factory = new MBeanProxyFactoryBean(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/JobSupport.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/JobSupport.java index 0d0338c30..f2454e180 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/JobSupport.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/JobSupport.java @@ -56,7 +56,7 @@ public class JobSupport implements BeanNameAware, Job { * Convenience constructor to immediately add name (which is mandatory but * not final). * - * @param name + * @param name the name */ public JobSupport(String name) { super(); @@ -83,6 +83,7 @@ public class JobSupport implements BeanNameAware, Job { * is a Spring bean. * * @see #setBeanName(java.lang.String) + * @param name the name */ public void setName(String name) { this.name = name; @@ -104,6 +105,10 @@ public class JobSupport implements BeanNameAware, Job { this.steps.add(step); } + public List getSteps() { + return steps; + } + /* (non-Javadoc) * @see org.springframework.batch.core.domain.IJob#getStartLimit() */ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java index 76a4c6316..9e9398393 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.Test; -import org.springframework.batch.sample.support.RetrySampleItemWriter; /** * Tests for {@link RetrySampleItemWriter}. @@ -15,7 +14,7 @@ public class RetrySampleItemWriterTests { private RetrySampleItemWriter processor = new RetrySampleItemWriter(); - /** + /* * Processing throws exception on 2nd and 3rd call. */ @Test diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/StepSupport.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/StepSupport.java index da6b5cce0..dd8a916d9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/StepSupport.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/StepSupport.java @@ -43,9 +43,6 @@ public class StepSupport implements Step, BeanNameAware { super(); } - /** - * @param string - */ public StepSupport(String string) { super(); this.name = string; @@ -68,11 +65,6 @@ public class StepSupport implements Step, BeanNameAware { } } - /** - * Set the name property. Always overrides the default value if this object is a Spring bean. - * - * @see #setBeanName(java.lang.String) - */ public void setName(String name) { this.name = name; }