diff --git a/docs/src/models/flat-file-input-source-design.dnx b/docs/src/models/flat-file-input-source-design.dnx index a9e156756..b18b0180a 100644 --- a/docs/src/models/flat-file-input-source-design.dnx +++ b/docs/src/models/flat-file-input-source-design.dnx @@ -16,7 +16,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -314,7 +314,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -368,7 +368,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -390,7 +390,7 @@ - + @@ -400,7 +400,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -455,7 +455,7 @@ - + @@ -472,7 +472,7 @@ - + @@ -482,7 +482,7 @@ - + @@ -493,7 +493,7 @@ - + @@ -503,7 +503,7 @@ - + @@ -513,7 +513,7 @@ - + @@ -524,7 +524,7 @@ - + @@ -534,7 +534,7 @@ - + @@ -545,7 +545,7 @@ - + diff --git a/docs/src/models/io-design.dnx b/docs/src/models/io-design.dnx index 5d77f2103..f5294f773 100644 --- a/docs/src/models/io-design.dnx +++ b/docs/src/models/io-design.dnx @@ -209,7 +209,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -761,7 +761,7 @@ - + @@ -851,7 +851,7 @@ - + @@ -872,7 +872,7 @@ - + @@ -911,7 +911,7 @@ - + @@ -1027,7 +1027,7 @@ - + @@ -1174,7 +1174,7 @@ - + @@ -1184,7 +1184,7 @@ - + @@ -1247,7 +1247,7 @@ - + @@ -1328,7 +1328,7 @@ - + diff --git a/docs/src/models/item-reader-design.dnx b/docs/src/models/item-reader-design.dnx index 70fbf68b7..0a981fb08 100644 --- a/docs/src/models/item-reader-design.dnx +++ b/docs/src/models/item-reader-design.dnx @@ -191,7 +191,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -600,7 +600,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -660,7 +660,7 @@ - + @@ -680,7 +680,7 @@ - + @@ -733,7 +733,7 @@ - + @@ -774,7 +774,7 @@ - + @@ -812,7 +812,7 @@ - + diff --git a/docs/src/models/item-stream-adapter.dnx b/docs/src/models/item-stream-adapter.dnx index 029480242..62cb870ec 100644 --- a/docs/src/models/item-stream-adapter.dnx +++ b/docs/src/models/item-stream-adapter.dnx @@ -85,7 +85,7 @@ - + @@ -306,7 +306,7 @@ - + diff --git a/docs/src/site/docbook/reference/readersAndWriters.xml b/docs/src/site/docbook/reference/readersAndWriters.xml index b88f6bce1..ac08e441f 100644 --- a/docs/src/site/docbook/reference/readersAndWriters.xml +++ b/docs/src/site/docbook/reference/readersAndWriters.xml @@ -620,7 +620,7 @@ <bean id="fixedLengthLineTokenizer" - class="org.springframework.batch.io.file.transform.FixedLengthTokenizer"> + class="org.springframework.batch.item.file.transform.FixedLengthTokenizer"> <property name="names" value="ISIN, Quantity, Price, Customer" /> <property name="columns" value="1-12, 13-15, 16-20, 21-29" /> </bean> @@ -676,7 +676,7 @@ prefix in a line with a particular tokenizer: <bean id="orderFileDescriptor" - class="org.springframework.batch.io.file.transform.PrefixMatchingCompositeLineTokenizer"> + class="org.springframework.batch.item.file.transform.PrefixMatchingCompositeLineTokenizer"> <property name="tokenizers"> <map> <entry key="HEA" value-ref="headerRecordDescriptor" /> @@ -768,7 +768,7 @@ would look like the following: <bean id="itemWriter" - class="org.springframework.batch.io.file.FlatFileItemWriter"> + class="org.springframework.batch.item.file.FlatFileItemWriter"> <property name="resource" value="file:target/test-outputs/20070122.testStream.multilineStep.txt" /> <property name="lineAggregator"> diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java index 771671e9b..8a831de94 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java @@ -63,7 +63,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#getNames() + * @see org.springframework.batch.item.file.mapping.IFieldSet#getNames() */ public String[] getNames() { if (names == null) { @@ -81,7 +81,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#getValues() + * @see org.springframework.batch.item.file.mapping.IFieldSet#getValues() */ public String[] getValues() { return tokens.clone(); @@ -89,7 +89,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readString(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readString(int) */ public String readString(int index) { return readAndTrim(index); @@ -97,7 +97,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readString(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readString(java.lang.String) */ public String readString(String name) { return readString(indexOf(name)); @@ -105,7 +105,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readRawString(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readRawString(int) */ public String readRawString(int index) { return tokens[index]; @@ -113,7 +113,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readRawString(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readRawString(java.lang.String) */ public String readRawString(String name) { return readRawString(indexOf(name)); @@ -121,7 +121,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBoolean(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(int) */ public boolean readBoolean(int index) { return readBoolean(index, "true"); @@ -129,7 +129,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBoolean(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(java.lang.String) */ public boolean readBoolean(String name) { return readBoolean(indexOf(name)); @@ -137,7 +137,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBoolean(int, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(int, * java.lang.String) */ public boolean readBoolean(int index, String trueValue) { @@ -150,7 +150,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBoolean(java.lang.String, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(java.lang.String, * java.lang.String) */ public boolean readBoolean(String name, String trueValue) { @@ -159,7 +159,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readChar(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readChar(int) */ public char readChar(int index) { String value = readAndTrim(index); @@ -171,7 +171,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readChar(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readChar(java.lang.String) */ public char readChar(String name) { return readChar(indexOf(name)); @@ -179,7 +179,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readByte(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readByte(int) */ public byte readByte(int index) { return Byte.parseByte(readAndTrim(index)); @@ -187,7 +187,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readByte(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readByte(java.lang.String) */ public byte readByte(String name) { return readByte(indexOf(name)); @@ -195,7 +195,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readShort(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readShort(int) */ public short readShort(int index) { return Short.parseShort(readAndTrim(index)); @@ -203,7 +203,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readShort(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readShort(java.lang.String) */ public short readShort(String name) { return readShort(indexOf(name)); @@ -211,7 +211,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readInt(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(int) */ public int readInt(int index) { return Integer.parseInt(readAndTrim(index)); @@ -219,7 +219,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readInt(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(java.lang.String) */ public int readInt(String name) { return readInt(indexOf(name)); @@ -227,7 +227,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readInt(int, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(int, * int) */ public int readInt(int index, int defaultValue) { @@ -238,7 +238,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readInt(java.lang.String, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(java.lang.String, * int) */ public int readInt(String name, int defaultValue) { @@ -247,7 +247,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readLong(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(int) */ public long readLong(int index) { return Long.parseLong(readAndTrim(index)); @@ -255,7 +255,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readLong(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(java.lang.String) */ public long readLong(String name) { return readLong(indexOf(name)); @@ -263,7 +263,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readLong(int, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(int, * long) */ public long readLong(int index, long defaultValue) { @@ -274,7 +274,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readLong(java.lang.String, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(java.lang.String, * long) */ public long readLong(String name, long defaultValue) { @@ -283,7 +283,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readFloat(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readFloat(int) */ public float readFloat(int index) { return Float.parseFloat(readAndTrim(index)); @@ -291,7 +291,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readFloat(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readFloat(java.lang.String) */ public float readFloat(String name) { return readFloat(indexOf(name)); @@ -299,7 +299,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readDouble(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readDouble(int) */ public double readDouble(int index) { return Double.parseDouble(readAndTrim(index)); @@ -307,7 +307,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readDouble(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readDouble(java.lang.String) */ public double readDouble(String name) { return readDouble(indexOf(name)); @@ -315,7 +315,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBigDecimal(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(int) */ public BigDecimal readBigDecimal(int index) { return readBigDecimal(index, null); @@ -323,7 +323,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBigDecimal(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(java.lang.String) */ public BigDecimal readBigDecimal(String name) { return readBigDecimal(name, null); @@ -331,7 +331,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBigDecimal(int, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(int, * java.math.BigDecimal) */ public BigDecimal readBigDecimal(int index, BigDecimal defaultValue) { @@ -347,7 +347,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readBigDecimal(java.lang.String, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(java.lang.String, * java.math.BigDecimal) */ public BigDecimal readBigDecimal(String name, BigDecimal defaultValue) { @@ -361,7 +361,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readDate(int) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int) */ public Date readDate(int index) { return readDate(index, DEFAULT_DATE_PATTERN); @@ -369,7 +369,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readDate(java.lang.String) + * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(java.lang.String) */ public Date readDate(String name) { return readDate(name, DEFAULT_DATE_PATTERN); @@ -377,7 +377,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readDate(int, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int, * java.lang.String) */ public Date readDate(int index, String pattern) { @@ -396,7 +396,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#readDate(java.lang.String, + * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(java.lang.String, * java.lang.String) */ public Date readDate(String name, String pattern) { @@ -410,7 +410,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#getFieldCount() + * @see org.springframework.batch.item.file.mapping.IFieldSet#getFieldCount() */ public int getFieldCount() { return tokens.length; @@ -492,7 +492,7 @@ public class DefaultFieldSet implements FieldSet { /* * (non-Javadoc) - * @see org.springframework.batch.io.file.mapping.IFieldSet#getProperties() + * @see org.springframework.batch.item.file.mapping.IFieldSet#getProperties() */ public Properties getProperties() { if (names == null) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java index 994cb1a6a..8b16bf9ff 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java @@ -28,7 +28,7 @@ public class PassThroughFieldSetMapper implements FieldSetMapper
{ * (non-Javadoc) * * @see - * org.springframework.batch.io.file.FieldSetMapper#mapLine(org.springframework + * org.springframework.batch.item.file.FieldSetMapper#mapLine(org.springframework * .batch.io.file.FieldSet) */ public FieldSet map(FieldSet fs) {