[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io/flat DelimitedFlatFileReader.java, 1.3,
Brought to you by:
suresh_pragada
From: Suresh <sur...@us...> - 2006-06-13 22:10:16
|
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28578 Modified Files: DelimitedFlatFileReader.java DelimitedFlatFileWriter.java FixedWidthFlatFileReader.java FixedWidthFlatFileWriter.java FlatFileReader.java FlatFileWriter.java Log Message: no message Index: FixedWidthFlatFileReader.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FixedWidthFlatFileReader.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FixedWidthFlatFileReader.java 12 Jun 2006 13:15:37 -0000 1.7 --- FixedWidthFlatFileReader.java 13 Jun 2006 22:10:08 -0000 1.8 *************** *** 11,14 **** --- 11,15 ---- package org.jmonks.batchserver.io.flat; import java.io.InputStream; + import java.io.Reader; import java.util.Iterator; import java.util.List; *************** *** 44,48 **** super(fileInputStream,fileSpec); } ! /** * Parses the given record string, translates it into the proper ReaderRecord --- 45,60 ---- super(fileInputStream,fileSpec); } ! ! /** ! * Constructs and initializes the reader with the given file path and file spec. ! * ! * @param reader Reader to the file. ! * @param fileSpec File spec to be used to read the file. ! */ ! public FixedWidthFlatFileReader(Reader reader,FileSpec fileSpec) ! { ! super(reader,fileSpec); ! } ! /** * Parses the given record string, translates it into the proper ReaderRecord Index: DelimitedFlatFileReader.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileReader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DelimitedFlatFileReader.java 12 Jun 2006 20:58:51 -0000 1.3 --- DelimitedFlatFileReader.java 13 Jun 2006 22:10:08 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- import java.io.InputStream; + import java.io.Reader; import java.util.Iterator; import java.util.List; *************** *** 55,58 **** --- 56,72 ---- /** + * Constructs the Delimited flat file reader from the given input stream + * and file spec. + * + * @param reader Reader representing the file to parse. + * @param fileSpec File spec of the delimited flat to be read. + */ + public DelimitedFlatFileReader(Reader reader,FileSpec fileSpec) + { + super(reader, fileSpec); + recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().get(0); + } + + /** * Parses the given record string where fields are delimited by a special character * and returns the reader record. Index: FlatFileWriter.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FlatFileWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FlatFileWriter.java 12 Jun 2006 13:15:37 -0000 1.2 --- FlatFileWriter.java 13 Jun 2006 22:10:08 -0000 1.3 *************** *** 15,22 **** import java.io.OutputStream; import java.io.OutputStreamWriter; ! import java.util.Arrays; import java.util.HashMap; - import java.util.Iterator; - import java.util.List; import java.util.Map; import org.apache.log4j.Logger; --- 15,20 ---- import java.io.OutputStream; import java.io.OutputStreamWriter; ! import java.io.Writer; import java.util.HashMap; import java.util.Map; import org.apache.log4j.Logger; *************** *** 66,75 **** public FlatFileWriter(OutputStream outputStream,FileSpec fileSpec) { logger.trace("Entering FlatFileWriter constructor"); this.fileSpec=fileSpec; ! writer=new BufferedWriter(new OutputStreamWriter(outputStream)); logger.info("Done creating the flat file writer."); } ! /** * Creates the writer record assocites with the given record type. --- 64,84 ---- public FlatFileWriter(OutputStream outputStream,FileSpec fileSpec) { + this(new OutputStreamWriter(outputStream), fileSpec); + } + + /** + * Constructs and initializes the writer with the given values. + * + * @param writer Writer to write the records. + * @param fileSpec File spec to be used to generate the file. + */ + public FlatFileWriter(Writer writer,FileSpec fileSpec) + { logger.trace("Entering FlatFileWriter constructor"); this.fileSpec=fileSpec; ! this.writer=new BufferedWriter(writer); logger.info("Done creating the flat file writer."); } ! /** * Creates the writer record assocites with the given record type. Index: DelimitedFlatFileWriter.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/DelimitedFlatFileWriter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DelimitedFlatFileWriter.java 12 Jun 2006 20:58:51 -0000 1.3 --- DelimitedFlatFileWriter.java 13 Jun 2006 22:10:08 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- import java.io.OutputStream; + import java.io.Writer; import java.util.Iterator; import org.apache.log4j.Logger; *************** *** 53,56 **** --- 54,70 ---- /** + * Constructs the Delimited flat file writer from the given output stream + * and file spec. + * + * @param writer Writer representing the file to generate. + * @param fileSpec File spec of the delimited flat to be generated. + */ + public DelimitedFlatFileWriter(Writer writer,FileSpec fileSpec) + { + super(writer,fileSpec); + recordSpec=(DelimitedFlatFileRecordSpec)fileSpec.getRecordSpecs().get(0); + } + + /** * Generates the string represenatation of the record from the writer record given by client. * Index: FixedWidthFlatFileWriter.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FixedWidthFlatFileWriter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FixedWidthFlatFileWriter.java 12 Jun 2006 13:15:37 -0000 1.7 --- FixedWidthFlatFileWriter.java 13 Jun 2006 22:10:08 -0000 1.8 *************** *** 12,15 **** --- 12,16 ---- import java.io.IOException; import java.io.OutputStream; + import java.io.Writer; import java.util.Arrays; import java.util.Iterator; *************** *** 17,21 **** import org.apache.log4j.Logger; import org.jmonks.batchserver.io.FileSpec; - import org.jmonks.batchserver.io.RecordType; import org.jmonks.batchserver.io.WriterRecord; import org.jmonks.batchserver.io.flat.FlatFileWriter.FlatFileWriterRecord; --- 18,21 ---- *************** *** 50,53 **** --- 50,64 ---- /** + * Constructs and initializes the writer with the given values. + * + * @param writer Writer to write the records. + * @param fileSpec File spec to be used to generate the file. + */ + public FixedWidthFlatFileWriter(Writer writer,FileSpec fileSpec) + { + super(writer,fileSpec); + } + + /** * Writes the given record into the file/writer. * Index: FlatFileReader.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/flat/FlatFileReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FlatFileReader.java 12 Jun 2006 13:15:37 -0000 1.2 --- FlatFileReader.java 13 Jun 2006 22:10:08 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- import java.io.InputStream; import java.io.InputStreamReader; + import java.io.Reader; import java.util.HashMap; import java.util.Map; *************** *** 54,60 **** public FlatFileReader(InputStream fileInputStream,FileSpec fileSpec) { logger.trace("Entering FlatFileReader constructor"); this.fileSpec=fileSpec; ! reader=new BufferedReader(new InputStreamReader(fileInputStream)); logger.info("Done creating the flat file reader."); } --- 55,72 ---- public FlatFileReader(InputStream fileInputStream,FileSpec fileSpec) { + this(new InputStreamReader(fileInputStream),fileSpec); + } + + /** + * Constructs and initializes the flat file reader with the given file path and file spec. + * + * @param reader Reader to the file. + * @param fileSpec File spec to be used to read the file. + */ + public FlatFileReader(Reader reader,FileSpec fileSpec) + { logger.trace("Entering FlatFileReader constructor"); this.fileSpec=fileSpec; ! reader=new BufferedReader(reader); logger.info("Done creating the flat file reader."); } |