From 79fa645acad7e304aa5081b218de7b2dfb2ded26 Mon Sep 17 00:00:00 2001 From: dsyer Date: Sun, 26 Apr 2009 15:40:13 +0000 Subject: [PATCH] RESOLVED - issue BATCH-1217: Suggest use .doubleValue() value in DefaultFieldSet.readDouble(..) --- .../item/file/transform/DefaultFieldSet.java | 4 ++-- .../file/transform/DefaultFieldSetTests.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java index 2e8ca4542..6487cb31d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java @@ -321,7 +321,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(int) */ public long readLong(int index) { - return (Long) parseNumber(readAndTrim(index)); + return parseNumber(readAndTrim(index)).longValue(); } /* @@ -385,7 +385,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readDouble(int) */ public double readDouble(int index) { - return (Double) parseNumber(readAndTrim(index)); + return (Double) parseNumber(readAndTrim(index)).doubleValue(); } /* diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java index 8cda76ce1..ba29fcd9b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java @@ -111,6 +111,14 @@ public class DefaultFieldSetTests { } + @Test + public void testReadIntegerAsFloat() throws Exception { + + assertEquals(354224, fieldSet.readFloat(5), .001); + assertEquals(354224, fieldSet.readFloat("Integer"), .001); + + } + @Test public void testReadFloat() throws Exception { @@ -119,6 +127,14 @@ public class DefaultFieldSetTests { } + @Test + public void testReadIntegerAsDouble() throws Exception { + + assertEquals(354224, fieldSet.readDouble(5), .001); + assertEquals(354224, fieldSet.readDouble("Integer"), .001); + + } + @Test public void testReadDouble() throws Exception {