From 8bdf835cdd2472db219d993f08f1f7d94334acb3 Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 15 Jan 2008 13:18:10 +0000 Subject: [PATCH] Fix compiler warnings --- .../batch/core/domain/JobInstanceProperties.java | 1 - .../batch/core/runtime/SimpleJobIdentifier.java | 2 +- .../batch/core/domain/JobInstancePropertiesTests.java | 6 +++--- .../batch/execution/repository/dao/JdbcJobDao.java | 4 ---- .../batch/io/file/SimpleFlatFileItemReaderTests.java | 3 --- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstanceProperties.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstanceProperties.java index 8edb5c03e..06283aff1 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstanceProperties.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstanceProperties.java @@ -11,7 +11,6 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.commons.lang.builder.HashCodeBuilder; -import org.springframework.util.Assert; /** * Value object representing runtime parameters to a batch job. Because diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java index b652f8773..fb4379a64 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java @@ -38,7 +38,7 @@ public class SimpleJobIdentifier implements JobIdentifier { * Default constructor. Since there it is required that the Identifier at least have a name, * the default constructor should not be called. */ - private SimpleJobIdentifier() { + SimpleJobIdentifier() { super(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesTests.java index 062e849d4..167a899df 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstancePropertiesTests.java @@ -54,7 +54,7 @@ public class JobInstancePropertiesTests extends TestCase { badLongMap.put("key", "bad long"); try{ - JobInstanceProperties testParameters = new JobInstanceProperties(stringMap, badLongMap, dateMap); + new JobInstanceProperties(stringMap, badLongMap, dateMap); fail(); } catch(IllegalArgumentException ex){ @@ -68,7 +68,7 @@ public class JobInstancePropertiesTests extends TestCase { badMap.put("key", new Integer(2)); try{ - JobInstanceProperties testParameters = new JobInstanceProperties(badMap, longMap, dateMap); + new JobInstanceProperties(badMap, longMap, dateMap); fail(); } catch(IllegalArgumentException ex){ @@ -82,7 +82,7 @@ public class JobInstancePropertiesTests extends TestCase { badMap.put("key", new java.sql.Date(System.currentTimeMillis())); try{ - JobInstanceProperties testParameters = new JobInstanceProperties(stringMap, longMap, badMap); + new JobInstanceProperties(stringMap, longMap, badMap); fail(); } catch(IllegalArgumentException ex){ diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java index 4e4222029..c3e21bb01 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobDao.java @@ -20,12 +20,10 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.sql.Types; -import java.util.Arrays; import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; import org.apache.commons.logging.Log; @@ -37,8 +35,6 @@ import org.springframework.batch.core.domain.JobInstance; import org.springframework.batch.core.domain.JobInstanceProperties; import org.springframework.batch.core.domain.JobInstancePropertiesBuilder; import org.springframework.batch.core.repository.NoSuchBatchDomainObjectException; -import org.springframework.batch.execution.runtime.DefaultJobIdentifier; -import org.springframework.batch.execution.runtime.ScheduledJobIdentifier; import org.springframework.batch.repeat.ExitStatus; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataRetrievalFailureException; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java index 4d474911f..8b8c98686 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java @@ -25,8 +25,6 @@ import junit.framework.TestCase; import org.springframework.batch.io.exception.BatchEnvironmentException; import org.springframework.batch.io.exception.FlatFileParsingException; -import org.springframework.batch.io.file.DefaultFlatFileItemReader; -import org.springframework.batch.io.file.SimpleFlatFileItemReader; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.io.file.separator.DefaultRecordSeparatorPolicy; @@ -34,7 +32,6 @@ import org.springframework.batch.io.file.transform.DelimitedLineTokenizer; import org.springframework.batch.io.file.transform.LineTokenizer; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; /**