From 0ef196d578f28e4b422d2c207a6d22923e32cc79 Mon Sep 17 00:00:00 2001 From: lucasward Date: Mon, 21 Jul 2008 04:19:54 +0000 Subject: [PATCH] BATCH-711:Modified ItemWriter interface to use parameterized types. Updated a portion of classes using ItemWriter as well. --- .../springframework/batch/sample/dao/JdbcGameDao.java | 9 ++------- .../batch/sample/dao/JdbcPlayerSummaryDao.java | 10 ++-------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java index 29871e7e1..b0f9d05be 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java @@ -5,19 +5,14 @@ import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.sample.domain.Game; import org.springframework.jdbc.core.support.JdbcDaoSupport; -import org.springframework.util.Assert; -public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter { +public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter { private static final String INSERT_GAME = "INSERT into GAMES(player_id,year_no,team,week,opponent," + "completes,attempts,passing_yards,passing_td,interceptions,rushes,rush_yards," + "receptions,receptions_yards,total_td) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - public void write(Object output) { - Assert.isTrue(output instanceof Game, - "Only Game objects can be written out" + "using this Dao"); - - Game game = (Game) output; + public void write(Game game) { Object[] args = new Object[] { game.getId(), new Integer(game.getYear()), game.getTeam(), diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java index 25970d1a8..5b2131ee0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java @@ -5,20 +5,14 @@ import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.sample.domain.PlayerSummary; import org.springframework.jdbc.core.support.JdbcDaoSupport; -import org.springframework.util.Assert; -public class JdbcPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter { +public class JdbcPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter { private static final String INSERT_SUMMARY = "INSERT into PLAYER_SUMMARY(ID,YEAR_NO,COMPLETES,ATTEMPTS," + "PASSING_YARDS,PASSING_TD,INTERCEPTIONS,RUSHES,RUSH_YARDS,RECEPTIONS,RECEPTIONS_YARDS," + "TOTAL_TD) values(?,?,?,?,?,?,?,?,?,?,?,?)"; - public void write(Object output) { - - Assert.isInstanceOf(PlayerSummary.class, output, JdbcPlayerSummaryDao.class.getName() + " only " + - "supports outputing " + PlayerSummary.class.getName() + " instances."); - - PlayerSummary summary = (PlayerSummary)output; + public void write(PlayerSummary summary) { Object[] args = new Object[]{summary.getId(), new Integer(summary.getYear()), new Integer(summary.getCompletes()), new Integer(summary.getAttempts()),