From 0113be758506d6d8d47eb4ec557a86af01b5b18e Mon Sep 17 00:00:00 2001 From: robokaso Date: Thu, 24 Apr 2008 15:37:34 +0000 Subject: [PATCH] RESOLVED - BATCH-601: Findbugs code audit --- .../java/org/springframework/batch/sample/domain/Game.java | 6 ++++++ .../springframework/batch/sample/domain/PlayerSummary.java | 5 +++++ .../batch/sample/item/reader/StagingItemReader.java | 2 +- .../batch/sample/dao/JdbcJobRepositoryTests.java | 4 ++-- .../test/jdbc/datasource/DerbyDataSourceFactoryBean.java | 3 --- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java index 82d8f5ed2..d49d02b39 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java @@ -3,6 +3,7 @@ package org.springframework.batch.sample.domain; import java.io.Serializable; import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; public class Game implements Serializable { @@ -212,4 +213,9 @@ public class Game implements Serializable { public boolean equals(Object obj) { return EqualsBuilder.reflectionEquals(this, obj); } + public int hashCode() { + return HashCodeBuilder.reflectionHashCode(this); + } + + } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java index 5fe1caf9d..048731904 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java @@ -1,6 +1,7 @@ package org.springframework.batch.sample.domain; import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; /** * Domain object representing the summary of a given Player's @@ -105,4 +106,8 @@ public class PlayerSummary { public boolean equals(Object obj) { return EqualsBuilder.reflectionEquals(this, obj); } + public int hashCode() { + return HashCodeBuilder.reflectionHashCode(this); + } + } 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 d471bce02..7d764fa70 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 @@ -158,7 +158,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite return false; } - private class StagingBuffer { + private static class StagingBuffer { private List list = new ArrayList(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java index 8f8ec6cb6..9ca4b8464 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java @@ -97,7 +97,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin JobExecution execution = null; long t0 = System.currentTimeMillis(); try { - execution = doConcurrentStart(); + doConcurrentStart(); fail("Expected JobExecutionAlreadyRunningException"); } catch (JobExecutionAlreadyRunningException e) { @@ -141,7 +141,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin long t0 = System.currentTimeMillis(); try { - execution = doConcurrentStart(); + doConcurrentStart(); fail("Expected JobExecutionAlreadyRunningException"); } catch (JobExecutionAlreadyRunningException e) { diff --git a/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java index 34160c1b3..cda9e3acc 100644 --- a/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java +++ b/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java @@ -11,8 +11,6 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean { private String dataDirectory = "derby-home"; - DataSource dataSource; - public void setDataDirectory(String dataDirectory) { this.dataDirectory = dataDirectory; } @@ -26,7 +24,6 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean { final EmbeddedDataSource ds = new EmbeddedDataSource(); ds.setDatabaseName("derbydb"); ds.setCreateDatabase("create"); - dataSource = ds; ds.getConnection().close(); ds.setCreateDatabase(null);