Merge branch 'fix-issue-161' of https://github.com/cboehme/metafacture-core into cboehme-fix-issue-161

Author: cboehme

src/main/java/org/culturegraph/mf/formeta/formatter/AbstractFormatter.java

@@ -16,68 +16,66 @@
 package org.culturegraph.mf.formeta.formatter;
 
 import org.culturegraph.mf.formeta.Formeta;
+import org.culturegraph.mf.util.StringUtil;
 
 /**
  * Base class for formatters.
- * 
+ *
  * @author Christoph Böhme.
- * 
+ *
  */
 public abstract class AbstractFormatter implements Formatter {
-	
-	public static final String ESCAPED_CHARS_QUOTED = "\n\r" 
-			+ Formeta.QUOT_CHAR 
+
+	public static final String ESCAPED_CHARS_QUOTED = "\n\r"
+			+ Formeta.QUOT_CHAR
 			+ Formeta.ESCAPE_CHAR;
-	
-	public static final String ESCAPED_CHARS = ESCAPED_CHARS_QUOTED 
-			+ Formeta.GROUP_START 
-			+ Formeta.GROUP_END 
-			+ Formeta.ITEM_SEPARATOR 
+
+	public static final String ESCAPED_CHARS = ESCAPED_CHARS_QUOTED
+			+ Formeta.GROUP_START
+			+ Formeta.GROUP_END
+			+ Formeta.ITEM_SEPARATOR
 			+ Formeta.NAME_VALUE_SEPARATOR;
 
-	private static final int BUFFER_SIZE = 1024;
+	protected static final int BUFFER_SIZE = 1024;
 
 	private final StringBuilder builder = new StringBuilder();
-	
+
 	private char[] buffer = new char[BUFFER_SIZE];
-	
+
 	@Override
 	public final void reset() {
 		builder.delete(0, builder.length());
 		onReset();
 	}
-	
+
 	@Override
 	public final String toString() {
 		return builder.toString();
 	}
-	
+
 	protected final void append(final char ch) {
 		builder.append(ch);
 	}
-	
+
 	protected final void append(final CharSequence charSeq) {
 		builder.append(charSeq);
 	}
 
 	protected final void escapeAndAppend(final String str) {
 		// According to http://stackoverflow.com/a/11876086 it is faster to copy
-		// the string into a char array than to use charAt():		
-		final int strLen = str.length();			
-		if(strLen > buffer.length) {
-			buffer = new char[buffer.length * 2];
-		}
-		str.getChars(0, strLen, buffer, 0);
-		
-		final boolean addQuotes = shouldQuoteText(buffer, strLen);
+		// a string into a char array then to use charAt():
+		buffer = StringUtil.copyToBuffer(str, buffer);
+		final int bufferLen = str.length();
+
+		final boolean addQuotes = shouldQuoteText(buffer, bufferLen);
 		final String charsToEscape;
 		if (addQuotes) {
 			builder.append(Formeta.QUOT_CHAR);
 			charsToEscape = ESCAPED_CHARS_QUOTED;
 		} else {
 			charsToEscape = ESCAPED_CHARS;
 		}
-		for (int i = 0; i < strLen; ++i) {
+		for (int i = 0; i < bufferLen; ++i) {
 			final char ch = buffer[i];
 			if (charsToEscape.indexOf(ch) > -1) {
 				appendEscapedChar(ch);
@@ -89,11 +87,11 @@ protected final void escapeAndAppend(final String str) {
 			builder.append(Formeta.QUOT_CHAR);
 		}
 	}
-	
+
 	protected void onReset() {
 		// Default implementation does nothing
 	}
-	
+
 	protected abstract boolean shouldQuoteText(final char[] buffer, final int len);
 
 	private void appendEscapedChar(final char ch) {
@@ -109,5 +107,5 @@ private void appendEscapedChar(final char ch) {
 			builder.append(ch);
 		}
 	}
-	
+
 }

src/main/java/org/culturegraph/mf/formeta/parser/FormetaParser.java

@@ -16,10 +16,11 @@
 package org.culturegraph.mf.formeta.parser;
 
 import org.culturegraph.mf.exceptions.FormatException;
+import org.culturegraph.mf.util.StringUtil;
 
 /**
  * A parser for the formeta metadata serialisation format.
- * 
+ *
  * @author Christoph Böhme
  *
  */
@@ -32,73 +33,70 @@ public final class FormetaParser {
 
 	private static final int BUFFER_SIZE = 1024 * 1024;
 
-	private char[] buffer = new char[BUFFER_SIZE];	
+	private char[] buffer = new char[BUFFER_SIZE];
 	private final StructureParserContext structureParserContext = new StructureParserContext();
 
 	public void setEmitter(final Emitter emitter) {
 		structureParserContext.setEmitter(emitter);
 	}
-	
+
 	public Emitter getEmitter() {
 		return structureParserContext.getEmitter();
 	}
 
 	public void parse(final String data) {
 		assert structureParserContext.getEmitter() != null: "No emitter set";
-		
-		// According to http://stackoverflow.com/a/11876086 it is faster to copy 
-		// the string into a char array than to use charAt():
-		final int recordLen = data.length();
-		if(recordLen > buffer.length) { 
-			buffer = new char[buffer.length * 2];
-		}
-		data.getChars(0, recordLen, buffer, 0);
-		
+
+		// According to http://stackoverflow.com/a/11876086 it is faster to copy
+		// a string into a char array then to use charAt():
+		buffer = StringUtil.copyToBuffer(data, buffer);
+		final int bufferLen = data.length();
+
 		structureParserContext.reset();
 		StructureParserState state = StructureParserState.ITEM_NAME;
 		int i = 0;
 		try {
-			for (; i < recordLen; ++i) {
+			for (; i < bufferLen; ++i) {
 				state = state.processChar(buffer[i], structureParserContext);
 			}
-		} catch (FormatException e) {
-			final String errorMsg = "Parsing error at position " 
+		} catch (final FormatException e) {
+			final String errorMsg = "Parsing error at position "
 					+ (i + 1) + ": "
-					+ getErrorSnippet(data, i) + ", " 
+					+ getErrorSnippet(data, i) + ", "
 					+ e.getMessage();
 			throw new FormatException(errorMsg, e);
 		}
 		try {
 			state.endOfInput(structureParserContext);
-		} catch (FormatException e) {
+		} catch (final FormatException e) {
 			throw new FormatException("Parsing error: " + e.getMessage(), e);
 		}
 	}
-	
+
 	/**
-	 * Extracts a text snippet from the record for showing the position at 
-	 * which an error occurred. The exact position additionally highlighted 
+	 * Extracts a text snippet from the record for showing the position at
+	 * which an error occurred. The exact position additionally highlighted
 	 * with {@link POS_MARKER_LEFT} and {@link POS_MARKER_RIGHT}.
-	 *    
+	 *
 	 * @param record the record currently being parsed
 	 * @param pos the position at which the error occurred
 	 * @return a text snippet.
 	 */
 	private static String getErrorSnippet(final String record, final int pos) {
 		final StringBuilder snippet = new StringBuilder();
-		
+
 		final int start = pos - SNIPPET_SIZE / 2;
 		if (start < 0) {
 			snippet.append(record.substring(0, pos));
 		} else {
 			snippet.append(SNIPPET_ELLIPSIS);
 			snippet.append(record.substring(start, pos));
 		}
-		
+
 		snippet.append(POS_MARKER_LEFT);
 		snippet.append(record.charAt(pos));
 		snippet.append(POS_MARKER_RIGHT);
-		
+
 		if (pos + 1 < record.length()) {
 			final int end = pos + SNIPPET_SIZE / 2;
 			if (end > record.length()) {
@@ -108,7 +106,7 @@ private static String getErrorSnippet(final String record, final int pos) {
 				snippet.append(SNIPPET_ELLIPSIS);
 			}
 		}
-		
+
 		return snippet.toString();
 	}