diff --git a/dictionary.txt b/dictionary.txt index fb79833f9..23ab68ea5 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -70,3 +70,4 @@ rethrow rethrown tokenizer tokenizes +immutable diff --git a/spring-batch-samples/.settings/org.eclipse.jdt.core.prefs b/spring-batch-samples/.settings/org.eclipse.jdt.core.prefs index 21347526f..93879fcfc 100644 --- a/spring-batch-samples/.settings/org.eclipse.jdt.core.prefs +++ b/spring-batch-samples/.settings/org.eclipse.jdt.core.prefs @@ -1,15 +1,22 @@ -#Tue Apr 22 13:47:16 CEST 2008 +#Wed Jul 16 13:31:46 CEST 2008 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -72,4 +79,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java index 8dab9f64a..d94dec03f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java @@ -49,8 +49,8 @@ public final class FieldSetResultSetExtractor { FieldSet fs = null; - List tokens = new ArrayList(); - List names = new ArrayList(); + List tokens = new ArrayList(); + List names = new ArrayList(); for (int i = 1; i <= columnCount; i++) { tokens.add(rs.getString(i)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java index 0fcbb5124..38127c049 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditDao.java @@ -33,14 +33,14 @@ public class HibernateCreditDao extends HibernateDaoSupport implements CustomerCreditDao, RepeatListener { private int failOnFlush = -1; - private List errors = new ArrayList(); + private List errors = new ArrayList(); /** * Public accessor for the errors property. * * @return the errors - a list of Throwable instances */ - public List getErrors() { + public List getErrors() { return errors; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java index d1e3553f9..c3d48dc93 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java @@ -40,7 +40,7 @@ public class OrderTransformer implements ItemTransformer { /** * Aggregators for all types of lines in the output file */ - private Map aggregators; + private Map aggregators; /** * Converts information from an Order object to a collection of Strings for @@ -49,19 +49,17 @@ public class OrderTransformer implements ItemTransformer { public Object transform(Object data) { Order order = (Order) data; - List result = new ArrayList(); + List result = new ArrayList(); result.add(getAggregator("header").aggregate(OrderFormatterUtils.headerArgs(order))); result.add(getAggregator("customer").aggregate(OrderFormatterUtils.customerArgs(order))); result.add(getAggregator("address").aggregate(OrderFormatterUtils.billingAddressArgs(order))); result.add(getAggregator("billing").aggregate(OrderFormatterUtils.billingInfoArgs(order))); - List items = order.getLineItems(); - LineItem item; + List items = order.getLineItems(); - for (int i = 0; i < items.size(); i++) { - item = (LineItem) items.get(i); - result.add(getAggregator("item").aggregate(OrderFormatterUtils.lineItemArgs(item))); + for (LineItem lineItem : items) { + result.add(getAggregator("item").aggregate(OrderFormatterUtils.lineItemArgs(lineItem))); } result.add(getAggregator("footer").aggregate(OrderFormatterUtils.footerArgs(order))); @@ -69,7 +67,7 @@ public class OrderTransformer implements ItemTransformer { return result; } - public void setAggregators(Map aggregators) { + public void setAggregators(Map aggregators) { this.aggregators = aggregators; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java index 35823b9a8..ece967224 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java @@ -44,7 +44,7 @@ public class Order { private ShippingInfo shipping; //order items - private List lineItems; + private List lineItems; public BillingInfo getBilling() { return billing; @@ -70,11 +70,11 @@ public class Order { this.customer = customer; } - public List getLineItems() { + public List getLineItems() { return lineItems; } - public void setLineItems(List lineItems) { + public void setLineItems(List lineItems) { this.lineItems = lineItems; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java index e8ed9f37b..a2a1bce7d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java @@ -30,7 +30,7 @@ public class Person { private String last_name = ""; private int age = 0; private Address address = new Address(); - private List children = new ArrayList(); + private List children = new ArrayList(); public Person(){ children.add(new Child()); @@ -76,13 +76,13 @@ public class Person { /** * @return the children */ - public List getChildren() { + public List getChildren() { return children; } /** * @param children the children to set */ - public void setChildren(List children) { + public void setChildren(List children) { this.children = children; } /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java index 1145eeb0b..4a74b3960 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java @@ -44,7 +44,7 @@ public class PersonService { Person person = new Person(); Address address = new Address(); Child child = new Child(); - List children = new ArrayList(1); + List children = new ArrayList(1); children.add(child); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java index 9cb32a1ba..1bb2ad045 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java @@ -30,7 +30,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class Order { private Customer customer; private Date date; - private List lineItems; + private List lineItems; private Shipper shipper; public Customer getCustomer() { @@ -49,11 +49,11 @@ public class Order { this.date = date; } - public List getLineItems() { + public List getLineItems() { return lineItems; } - public void setLineItems(List lineItems) { + public void setLineItems(List lineItems) { this.lineItems = lineItems; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java index 09903a47d..cf2c08180 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java @@ -162,10 +162,10 @@ public class OrderItemReader extends DelegatingItemReader { log.debug("MAPPING LINE ITEM"); if (order.getLineItems() == null) { - order.setLineItems(new ArrayList()); + order.setLineItems(new ArrayList()); } - order.getLineItems().add(itemMapper.mapLine(fieldSet)); + order.getLineItems().add((LineItem) itemMapper.mapLine(fieldSet)); return; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java index 261a4b959..d6258bfed 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java @@ -44,7 +44,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite private volatile boolean initialized = false; - private volatile Iterator keys; + private volatile Iterator keys; /** * Public setter for the {@link LobHandler}. @@ -83,7 +83,8 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite } } - private List retrieveKeys() { + @SuppressWarnings("unchecked") + private List retrieveKeys() { synchronized (lock) { @@ -166,9 +167,9 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite private static class StagingBuffer { - private List list = new ArrayList(); + private List list = new ArrayList(); - private Iterator iter = new ArrayList().iterator(); + private Iterator iter = new ArrayList().iterator(); public Long next() { if (iter.hasNext()) { @@ -183,13 +184,13 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite public void rollback() { logger.debug("Resetting buffer on rollback: " + list); - iter = new ArrayList(list).iterator(); + iter = new ArrayList(list).iterator(); } public void commit() { logger.debug("Clearing buffer on commit: " + list); list.clear(); - iter = new ArrayList().iterator(); + iter = new ArrayList().iterator(); } public String toString() { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java index a72f515e7..3059b4f15 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java @@ -11,7 +11,7 @@ import org.springframework.batch.item.validator.ValidationException; */ public class ItemTrackingItemWriter extends AbstractItemWriter { - private List items = new ArrayList(); + private List items = new ArrayList(); private int failure = -1; @@ -25,7 +25,7 @@ public class ItemTrackingItemWriter extends AbstractItemWriter { } } - public List getItems() { + public List getItems() { return items; } 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 eb9a3c3cd..1bac33284 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 @@ -4,7 +4,6 @@ package org.springframework.batch.sample.launch; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.springframework.batch.core.Job; @@ -18,15 +17,15 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.util.Assert; -public class DefaultJobLoader implements JobLoader, - ApplicationContextAware { +public class DefaultJobLoader implements JobLoader, ApplicationContextAware { private ListableJobRegistry registry; - private ApplicationContext applicationContext; - private Map configurations = new HashMap(); - public void setApplicationContext(ApplicationContext applicationContext) - throws BeansException { + private ApplicationContext applicationContext; + + private Map configurations = new HashMap(); + + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } @@ -34,12 +33,11 @@ public class DefaultJobLoader implements JobLoader, this.registry = registry; } - public Map getConfigurations() { - Map result = new HashMap(configurations); - for (Iterator iterator = registry.getJobNames().iterator(); iterator - .hasNext();) { + public Map getConfigurations() { + Map result = new HashMap(configurations); + for (String jobName : registry.getJobNames()) { try { - Job configuration = (Job) registry.getJob((String) iterator.next()); + Job configuration = (Job) registry.getJob(jobName); String name = configuration.getName(); if (!configurations.containsKey(name)) { result.put(name, ": " + configuration); @@ -53,19 +51,20 @@ public class DefaultJobLoader implements JobLoader, } public void loadResource(String path) { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - new String[] { path }, applicationContext); + 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]; configurations.put(name, path); } } - + public Object getJobConfiguration(String name) { try { return registry.getJob(name); - } catch (NoSuchJobException e) { + } + catch (NoSuchJobException e) { return null; } } @@ -73,22 +72,22 @@ public class DefaultJobLoader implements JobLoader, public Object getProperty(String path) { int index = PropertyAccessorUtils.getFirstNestedPropertySeparatorIndex(path); BeanWrapperImpl wrapper = createBeanWrapper(path, index); - String key = path.substring(index+1); + String key = path.substring(index + 1); return wrapper.getPropertyValue(key); } public void setProperty(String path, String value) { int index = PropertyAccessorUtils.getFirstNestedPropertySeparatorIndex(path); BeanWrapperImpl wrapper = createBeanWrapper(path, index); - String key = path.substring(index+1); + String key = path.substring(index + 1); wrapper.setPropertyValue(key, value); } private BeanWrapperImpl createBeanWrapper(String path, int index) { - Assert.state(index>0, "Path must be nested, e.g. bean.value"); - String name = path.substring(0,index); + Assert.state(index > 0, "Path must be nested, e.g. bean.value"); + String name = path.substring(0, index); Object bean = getJobConfiguration(name); - Assert.notNull(bean, "No JobConfiguration exists with name="+name); + Assert.notNull(bean, "No JobConfiguration exists with name=" + name); BeanWrapperImpl wrapper = new BeanWrapperImpl(bean); return wrapper; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/ExportedJobLoader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/ExportedJobLoader.java index fd9592ff5..8e851a091 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/ExportedJobLoader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/ExportedJobLoader.java @@ -26,7 +26,7 @@ public interface ExportedJobLoader { void loadResource(String path); - Map getConfigurations(); + Map getConfigurations(); String getJob(String path); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/JobLoader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/JobLoader.java index d28b4bbc2..066a25c72 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/JobLoader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/JobLoader.java @@ -26,7 +26,7 @@ public interface JobLoader { void loadResource(String path); - Map getConfigurations(); + Map getConfigurations(); Object getJobConfiguration(String path); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java index 40e2f2537..9aba00d09 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java @@ -42,7 +42,7 @@ public class TaskExecutorLauncher implements ResourceLoaderAware { private ApplicationContext parentContext = null; - private static List errors = new ArrayList(); + private static List errors = new ArrayList(); /** * Public setter for the {@link JobRegistry}. @@ -64,7 +64,7 @@ public class TaskExecutorLauncher implements ResourceLoaderAware { * Public getter for the errors. * @return the errors */ - public static List getErrors() { + public static List getErrors() { return errors; } 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 2a544bc9c..b094b5217 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 @@ -16,7 +16,6 @@ package org.springframework.batch.sample.quartz; import java.util.Date; -import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -63,8 +62,9 @@ public class JobLauncherDetails extends QuartzJobBean { this.jobLauncher = jobLauncher; } + @SuppressWarnings("unchecked") protected void executeInternal(JobExecutionContext context) { - Map jobDataMap = context.getMergedJobDataMap(); + Map jobDataMap = context.getMergedJobDataMap(); String jobName = (String) jobDataMap.get(JOB_NAME); log.info("Quartz trigger firing with Spring Batch jobName="+jobName); JobParameters jobParameters = getJobParametersFromJobMap(jobDataMap); @@ -82,13 +82,12 @@ public class JobLauncherDetails extends QuartzJobBean { * * @return a {@link JobParameters} instance */ - private JobParameters getJobParametersFromJobMap(Map jobDataMap) { + private JobParameters getJobParametersFromJobMap(Map jobDataMap) { JobParametersBuilder builder = new JobParametersBuilder(); - for (Iterator iterator = jobDataMap.entrySet().iterator(); iterator.hasNext();) { - Entry entry = (Entry) iterator.next(); - String key = (String) entry.getKey(); + for (Entry entry : jobDataMap.entrySet()) { + String key = entry.getKey(); Object value = entry.getValue(); if (value instanceof String && !key.equals(JOB_NAME)) { builder.addString(key, (String) value); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapper.java index 360858048..5e4af2ef7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapper.java @@ -17,7 +17,7 @@ public class ConfigurableSystemProcessExitCodeMapper implements SystemProcessExi public static final String ELSE_KEY = "else"; - private Map mappings; + private Map mappings; public ExitStatus getExitStatus(int exitCode) { ExitStatus exitStatus = (ExitStatus) mappings.get(new Integer(exitCode)); @@ -32,7 +32,7 @@ public class ConfigurableSystemProcessExitCodeMapper implements SystemProcessExi * @param mappings Integer exit code keys to * {@link org.springframework.batch.repeat.ExitStatus} values. */ - public void setMappings(Map mappings) { + public void setMappings(Map mappings) { Assert.notNull(mappings.get(ELSE_KEY)); this.mappings = mappings; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java index a98091066..326a4004b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java @@ -38,7 +38,8 @@ public class TotalOrderItemsFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { //get arguments int count = ((Integer) getArguments()[0].getResult(target)).intValue(); Object value = getArguments()[1].getResult(target); @@ -49,9 +50,8 @@ public class TotalOrderItemsFunction extends AbstractFunction { if (value instanceof List) { int totalItems = 0; - for (Iterator i = ((List) value).iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); - totalItems += item.getQuantity(); + for (Iterator i = ((List) value).iterator(); i.hasNext();) { + totalItems += i.next().getQuantity(); } result = (totalItems == count) ? Boolean.TRUE : Boolean.FALSE; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java index b369c9e13..1b0d16023 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java @@ -17,7 +17,6 @@ package org.springframework.batch.sample.validation.valang.custom; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.LineItem; @@ -41,11 +40,11 @@ public class ValidateDiscountsFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { - List lineItems = (List) getArguments()[0].getResult(target); + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { + List lineItems = (List) getArguments()[0].getResult(target); - for (Iterator i = lineItems.iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); + for (LineItem item : lineItems) { if (BD_0.compareTo(item.getDiscountPerc()) != 0) { //DiscountPerc must be between 0.0 and 100.0 diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java index c4709bc7e..0e41ba486 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java @@ -17,7 +17,6 @@ package org.springframework.batch.sample.validation.valang.custom; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.LineItem; @@ -41,11 +40,11 @@ public class ValidateHandlingPricesFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { - List lineItems = (List) getArguments()[0].getResult(target); + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { + List lineItems = (List) getArguments()[0].getResult(target); - for (Iterator i = lineItems.iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); + for (LineItem item : lineItems) { if ((BD_MIN.compareTo(item.getHandlingPrice()) > 0) || (BD_MAX.compareTo(item.getHandlingPrice()) < 0)) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java index 4344fc412..f42cdd7c5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java @@ -16,7 +16,6 @@ package org.springframework.batch.sample.validation.valang.custom; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.LineItem; @@ -39,11 +38,11 @@ public class ValidateIdsFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { - List lineItems = (List) getArguments()[0].getResult(target); + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { + List lineItems = (List) getArguments()[0].getResult(target); - for (Iterator i = lineItems.iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); + for (LineItem item : lineItems) { if ((item.getItemId() <= 0) || (item.getItemId() > MAX_ID)) { return Boolean.FALSE; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java index d9283fe02..510c6dc6a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java @@ -17,7 +17,6 @@ package org.springframework.batch.sample.validation.valang.custom; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.LineItem; @@ -41,11 +40,11 @@ public class ValidatePricesFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { - List lineItems = (List) getArguments()[0].getResult(target); + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { + List lineItems = (List) getArguments()[0].getResult(target); - for (Iterator i = lineItems.iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); + for (LineItem item : lineItems) { if ((BD_MIN.compareTo(item.getPrice()) > 0) || (BD_MAX.compareTo(item.getPrice()) < 0)) { return Boolean.FALSE; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java index 587b2b004..652e58bf5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java @@ -16,7 +16,6 @@ package org.springframework.batch.sample.validation.valang.custom; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.LineItem; @@ -39,11 +38,11 @@ public class ValidateQuantitiesFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { - List lineItems = (List) getArguments()[0].getResult(target); + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { + List lineItems = (List) getArguments()[0].getResult(target); - for (Iterator i = lineItems.iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); + for (LineItem item : lineItems) { if ((item.getQuantity() <= 0) || (item.getQuantity() > MAX_QUANTITY)) { return Boolean.FALSE; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java index 7b4299847..de278ed8c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java @@ -17,7 +17,6 @@ package org.springframework.batch.sample.validation.valang.custom; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.LineItem; @@ -41,11 +40,11 @@ public class ValidateShippingPricesFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { - List lineItems = (List) getArguments()[0].getResult(target); + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { + List lineItems = (List) getArguments()[0].getResult(target); - for (Iterator i = lineItems.iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); + for (LineItem item : lineItems) { if ((BD_MIN.compareTo(item.getShippingPrice()) > 0) || (BD_MAX.compareTo(item.getShippingPrice()) < 0)) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java index 57af7ad69..c636cb8b2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java @@ -17,7 +17,6 @@ package org.springframework.batch.sample.validation.valang.custom; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import org.springframework.batch.sample.domain.LineItem; @@ -42,11 +41,11 @@ public class ValidateTotalPricesFunction extends AbstractFunction { /** * @see org.springmodules.validation.valang.functions.AbstractFunction#doGetResult(java.lang.Object) */ - protected Object doGetResult(Object target) throws Exception { - List lineItems = (List) getArguments()[0].getResult(target); + @SuppressWarnings("unchecked") + protected Object doGetResult(Object target) throws Exception { + List lineItems = (List) getArguments()[0].getResult(target); - for (Iterator i = lineItems.iterator(); i.hasNext();) { - LineItem item = (LineItem) i.next(); + for (LineItem item : lineItems) { if ((BD_MIN.compareTo(item.getTotalPrice()) > 0) || (BD_MAX.compareTo(item.getTotalPrice()) < 0)) {