Preparing to release version 2.9.0

uniVocity · Aug 15, 2020 · f392311 · f392311
1 parent 70b2e71
commit f392311
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7  4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.univocity</groupId>
 	<artifactId>univocity-parsers</artifactId>
-	<version>2.8.5-SNAPSHOT</version>
 	<version>2.9.0</version>
 	<name>univocity-parsers</name>
 	<packaging>jar</packaging>
 	<description>univocity's open source parsers for processing different text formats using a consistent API</description>

diff --git a/src/main/java/com/univocity/parsers/common/AbstractParser.java b/src/main/java/com/univocity/parsers/common/AbstractParser.java
@@ -74,7  74,7 @@ public abstract class AbstractParser<T extends CommonParserSettings<?>> {
 	protected boolean ignoreTrailingWhitespace;
 	protected boolean ignoreLeadingWhitespace;
 
-	private final boolean commentLineCheck;
 	private final boolean processComments;
 
 	/**
 	 * All parsers must support, at the very least, the settings provided by {@link CommonParserSettings}. The AbstractParser requires its configuration to be
@@ -98,7  98,7 @@ public AbstractParser(T settings) {
 		this.comments = collectComments ? new TreeMap<Long, String>() : Collections.<Long, String>emptyMap();
 		this.extractHeaders = settings.isHeaderExtractionEnabled();
 		this.whitespaceRangeStart = settings.getWhitespaceRangeStart();
-		this.commentLineCheck = settings.isCommentLineCheckEnabled();
 		this.processComments = settings.isCommentProcessingEnabled();
 	}
 
 	protected void processComment() {
@@ -130,11  130,9 @@ public final void parse(Reader reader) {
 			while (!context.isStopped()) {
 				input.markRecordStart();
 				ch = input.nextChar();
-				if(commentLineCheck) {
-					if (inComment()) {
-						processComment();
-						continue;
-					}
 				if (processComments && inComment()) {
 					processComment();
 					continue;
 				}
 
 				if (output.pendingRecords.isEmpty()) {
@@ -571,11  569,9 @@ public final String[] parseNext() {
 			while (!context.isStopped()) {
 				input.markRecordStart();
 				ch = input.nextChar();
-				if(commentLineCheck) {
-					if (inComment()) {
-						processComment();
-						continue;
-					}
 				if (processComments && inComment()) {
 					processComment();
 					continue;
 				}
 				if (output.pendingRecords.isEmpty()) {
 					parseRecord();
@@ -679,11  675,9 @@ public final String[] parseLine(String line) {
 			while (!context.isStopped()) {
 				input.markRecordStart();
 				ch = input.nextChar();
-				if(commentLineCheck) {
-					if (inComment()) {
-						processComment();
-						return null;
-					}
 				if (processComments && inComment()) {
 					processComment();
 					return null;
 				}
 				if (output.pendingRecords.isEmpty()) {
 					parseRecord();

diff --git a/src/main/java/com/univocity/parsers/common/CommonParserSettings.java b/src/main/java/com/univocity/parsers/common/CommonParserSettings.java
@@ -65,7  65,7 @@ public abstract class CommonParserSettings<F extends Format> extends CommonSetti
 	private long numberOfRowsToSkip = 0L;
 	private boolean commentCollectionEnabled = false;
 	private boolean autoClosingEnabled = true;
-	private boolean commentLineCheckEnabled = true;
 	private boolean commentProcessingEnabled = true;
 	/**
 	 * Indicates whether or not a separate thread will be used to read characters from the input while parsing (defaults true if the number of available
 	 * processors at runtime is greater than 1)
@@ -504,20  504,20 @@ public void setAutoClosingEnabled(boolean autoClosingEnabled) {
 	 * If disabled/false then parser wont treat any line as comment line including default(#)
 	 * this condition will supersede the comment character(#)
 	 */
-	public boolean isCommentLineCheckEnabled() {
-		return commentLineCheckEnabled;
 	public boolean isCommentProcessingEnabled() {
 		return commentProcessingEnabled;
 	}
 
 	/**
 	 * Configures whether the parser will check for the comment line in the file
 	 * Defaults to {@code true}
 	 *
-	 * @param commentLineCheckEnabled flag determining whether comment line check should be performed
 	 * @param commentProcessingEnabled flag determining whether comment line check should be performed
 	 *If disabled/false then parser wont treat any line as comment line including default(#)
 	 * this condition will supersede the comment character(#)
 	 */
-	public void setCommentLineCheckEnabled(boolean commentLineCheckEnabled) {
-		this.commentLineCheckEnabled = commentLineCheckEnabled;
 	public void setCommentProcessingEnabled(boolean commentProcessingEnabled) {
 		this.commentProcessingEnabled = commentProcessingEnabled;
 	}
 
 }
diff --git a/src/test/java/com/univocity/parsers/csv/CsvParserTest.java b/src/test/java/com/univocity/parsers/csv/CsvParserTest.java
@@ -872,7  872,7 @@ public void parseDisablingCommentLineCheck(String csvFile, char[] lineSeparator)
 		CsvParserSettings settings = newCsvInputSettings(lineSeparator);
 		settings.setCommentCollectionEnabled(true);
 		settings.setRowProcessor(processor);
-		settings.setCommentLineCheckEnabled(false);
 		settings.setCommentProcessingEnabled(false);
 		settings.setHeaderExtractionEnabled(true);
 		settings.setIgnoreLeadingWhitespaces(true);
 		settings.setIgnoreTrailingWhitespaces(true);

diff --git a/src/test/java/com/univocity/parsers/issues/github/Github_394.java b/src/test/java/com/univocity/parsers/issues/github/Github_394.java
@@ -34,7  34,7 @@ public void testParsingLineWithEnableCommentLineCheckToFalse() {
 		format.setLineSeparator("\n");
 		format.setDelimiter(',');
 
-		s.setCommentLineCheckEnabled(false);
 		s.setCommentProcessingEnabled(false);
 		s.setIgnoreLeadingWhitespaces(true);
 		s.setIgnoreTrailingWhitespaces(true);
 		s.setNullValue("");