clean Debatcher CTORs; start to enable DebatcherTest

Author: short000

src/main/java/org/null0/edi/debatcher/ConfigDefault.java

@@ -10,6 +10,7 @@
 import java.nio.file.Paths;
 import java.util.Properties;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.null0.edi.debatcher.interfaces.Config;
 import org.slf4j.Logger;
@@ -32,6 +33,7 @@ public class ConfigDefault implements Config {
 	// Configuration Values from debatcher.properties
 	private Path outDir;
 	private int bufferSize;
+	private boolean willUpdateTransactionId;
 	private String[] validSendersISA06;
 	private String[] validReceiversISA08;
 
@@ -79,10 +81,16 @@ public String[] getValidSenders() {
 	public String[] getValidReceivers() {
 		return validReceiversISA08;
 	}
+
+	@Override
+	public boolean willUpdateTransactionId() {
+		return willUpdateTransactionId;
+	}
 
 	private void setProperties() throws Exception {
 		this.bufferSize = Integer.parseInt(this.properties.getProperty("buffer_size"));
 		this.outDir = toPath(this.properties.getProperty("output_directory"));		
+		this.willUpdateTransactionId = BooleanUtils.toBoolean(this.properties.getProperty("will_update_transaction_id"));
 		this.validSendersISA06 = setList("valid_senders_isa06");
 		this.validReceiversISA08 = setList("valid_receivers_isa08");
 	}

src/main/java/org/null0/edi/debatcher/Debatcher.java

@@ -84,42 +84,33 @@ public class Debatcher {
 	private String segment = null;
 	private String outputLocation;
 	private Map<String, Long> claimIdMap = new HashMap<String, Long>();
-	private boolean transactionIdUpdate = true;
+	private boolean updateTransactionId = true;
 
 	public Debatcher() {
-		this.config = new ConfigDefault();
-		this.ediValidator = new EdiValidatorDefault(false);
-		this.metadataLogger = new MetadataLoggerDefault();
+		this (new ConfigDefault(), new EdiValidatorDefault(false), new MetadataLoggerDefault());
 	}
 
 	public Debatcher(Config config, EdiValidator ediValidator, MetadataLogger metadataLogger) {
 		this.config = config;
 		this.ediValidator = ediValidator;
 		this.metadataLogger = metadataLogger;
-	}
-
-	public void debatch(String transactionId, InputStream is) throws Exception {
-		logger.info("debatching started..." + transactionId);
-		this.transactionId = transactionId;
-		this.inputStream = is;
 		this.outputLocation = this.config.getOutputDirectory().toString();		
-		this.batchIdMetadata = metadataLogger.logBatchSubmissionData(transactionId);
+		this.updateTransactionId = this.config.willUpdateTransactionId();
+	}
 
-		readInterchangeControls();
-		is.close();
+	public void debatch(String transactionId, InputStream inputStream) throws Exception {
+		debatch(transactionId, -1, inputStream);
 	}
 
-	public Map<String, Long> debatch(String transactionId, long batchIdMetadata, InputStream is, String outputLocation,	boolean transactionIdUpdate) throws Exception {
+	public Map<String, Long> debatch(String transactionId, long batchIdMetadata, InputStream inputStream) throws Exception {
 		logger.info("debatching started..." + transactionId);
 		this.transactionId = transactionId;
-		this.inputStream = is;
-		this.batchIdMetadata = batchIdMetadata;
-		this.outputLocation = outputLocation;
-		this.transactionIdUpdate = transactionIdUpdate;
-
+		this.inputStream = inputStream;
+		this.batchIdMetadata = batchIdMetadata < 0 ? this.metadataLogger.logBatchSubmissionData(transactionId) : batchIdMetadata;
+		
 		readInterchangeControls();
-		is.close();
-
+		
+		inputStream.close(); // TODO: Why are we closing a stream we do not own? Shouldn't that be the responsibility of the caller that passed it in?
 		return claimIdMap;
 	}
 
@@ -130,9 +121,7 @@ private void readInterchangeControls() throws Exception {
 				continue;
 			}
 			if (segment == null || segment.equals("\r\n")) {
-				throw new DebatcherException ("Invalid Control Structure",
-						EdiValidatorDefault.TA1_ERROR_ISAIEA,
-						ERROR.TYPE_TA1, ERROR_LEVEL.Batch, batchIdMetadata);
+				throw new DebatcherException ("Invalid Control Structure", EdiValidatorDefault.TA1_ERROR_ISAIEA, ERROR.TYPE_TA1, ERROR_LEVEL.Batch, batchIdMetadata);
 			}
 			isaSegment = segment.replaceAll("\\r|\\n", "");
 			ediValidator.validate(batchIdMetadata, X12_ELEMENT.DATA_SEPARATOR, fieldDlm, null);
@@ -141,9 +130,9 @@ private void readInterchangeControls() throws Exception {
 
 			isaIdMetadata = metadataLogger.logIsaData(batchIdMetadata, isa13, isaSegment);
 			String isa06 = readField(segment, 6);
-			if (transactionIdUpdate) {
+			if (updateTransactionId) {
 				transactionId = isa06.trim() + transactionId;
-				transactionIdUpdate = false;
+				updateTransactionId = false;
 			}
 			ediValidator.validate(batchIdMetadata, X12_ELEMENT.ISA06, isa06, null);
 			ediValidator.validate(batchIdMetadata, X12_ELEMENT.ISA07, readField(segment, 7), null);

src/main/java/org/null0/edi/debatcher/interfaces/Config.java

@@ -7,6 +7,7 @@ public enum ConfigurationSource { ENVIRONMENT_VARIABLE, LOCAL_PROPERTIES, EXTERN
 	public ConfigurationSource getConfigurationSource();
 	public Path getOutputDirectory();
 	public int getBufferSize();
+	public boolean willUpdateTransactionId();
 	public String[] getValidSenders();
 	public String[] getValidReceivers();
 }

src/main/resources/debatcher.properties

@@ -1,4 +1,5 @@
 buffer_size=8096
 output_directory=./
+will_update_transaction_id=true
 valid_senders_isa06=
-valid_receivers_isa08=
+valid_receivers_isa08=