[ 2b5f84e ] before bug fix 4

Author: dodoyoon

NOTICE.txt

@@ -3,3 +3,9 @@ Copyright 2005-2013 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+
+src/main/resources/contract.txt
+This file was downloaded from http://www.ferc.gov/docs-filing/eqr/soft-tools/sample-csv/contract.txt and contains neither copyright notice nor license.
+
+src/main/resources/transaction.txt
+This file was downloaded from http://www.ferc.gov/docs-filing/eqr/soft-tools/sample-csv/transaction.txt and contains neither copyright notice nor license.

pom.xml

@@ -21,7 +21,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>28</version>
+    <version>32</version>
   </parent>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-csv</artifactId>
@@ -50,6 +50,7 @@ CSV files of various types.
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
+      <!-- 1.3.172 requires Java 1.6 -->
       <version>1.3.168</version>
       <scope>test</scope>
     </dependency>
@@ -89,14 +90,22 @@ CSV files of various types.
     </developer>
   </developers>
   <contributors>
+    <contributor>
+      <name>Bob Smith</name>
+    </contributor>
   </contributors>
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/csv/trunk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/csv/trunk</developerConnection>
-    <url>http://svn.apache.org/repos/asf/commons/proper/csv/trunk</url>
+    <url>http://svn.apache.org/viewvc/commons/proper/csv/trunk</url>
   </scm>
 
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/CSV</url>
+  </issueManagement>
+
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -112,12 +121,17 @@ CSV files of various types.
     <commons.componentid>csv</commons.componentid>
     <commons.jira.id>CSV</commons.jira.id>
     <commons.jira.pid>12313222</commons.jira.pid>
-    <maven.compile.source>1.7</maven.compile.source>
-    <maven.compile.target>1.7</maven.compile.target>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
     <!-- Ensure copies work OK (can be removed later when this is in parent POM) -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <commons.encoding>UTF-8</commons.encoding>
+    <!-- 
+        Use 2.9.1 instead of 2.10; 2.10 seems to scan the 'target' dir
+        and wants license headers in .properties to be the header for Java files. 
+    -->
+    <checkstyle.version>2.9.1</checkstyle.version>
     <checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>
   </properties>
 
@@ -142,22 +156,31 @@ CSV files of various types.
           </excludes>
         </configuration>
       </plugin>
+      <!-- Allow checkstyle to be run interactively; keep in sync with report config below -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.version}</version>
+        <configuration>
+          <configLocation>${basedir}/checkstyle.xml</configLocation>
+          <enableRulesSummary>false</enableRulesSummary>
+          <headerLocation>${checkstyle.header.file}</headerLocation>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
   <reporting>
     <plugins>
+      <!-- Keep in sync with build config above -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <!-- Use 2.9.1 instead of 2.10; 2.10 seems to scan the 'target' 
-        dir and wants license headers in .properties to be the header for 
-        Java files. -->
-        <version>2.9.1</version>
+        <version>${checkstyle.version}</version>
         <configuration>
           <configLocation>${basedir}/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
-          <headerFile>${basedir}/LICENSE-header.txt</headerFile>
+          <headerLocation>${checkstyle.header.file}</headerLocation>
         </configuration>
         <!-- We need to specify reportSets because 2.9.1 creates two reports -->
         <reportSets>
@@ -173,7 +196,7 @@ CSV files of various types.
         <artifactId>maven-pmd-plugin</artifactId>
         <version>3.0.1</version>
         <configuration>
-          <targetJdk>${maven.compile.target}</targetJdk>
+          <targetJdk>${maven.compiler.target}</targetJdk>
         </configuration>
       </plugin>
       <plugin>
@@ -193,6 +216,10 @@ CSV files of various types.
           </tags>
         </configuration>
       </plugin>
+      <!--
+          NOTE: this requires Maven 3.0.x; when used with Maven 2.2.1, the following error is seen:
+          Embedded error: Error rendering Maven report: org.dom4j.DocumentFactory cannot be cast to org.dom4j.DocumentFactory
+       -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>javancss-maven-plugin</artifactId>

randoop/myclasses.txt

@@ -1,6 +1,5 @@
-org.apache.commons.csv.CSVFormat$CSVFormatBuilder
+org.apache.commons.csv.Assertions
 org.apache.commons.csv.CSVFormat
-org.apache.commons.csv.CSVLexer
 org.apache.commons.csv.CSVParser$1
 org.apache.commons.csv.CSVParser$2
 org.apache.commons.csv.CSVParser

src/changes/changes.xml

@@ -20,13 +20,13 @@
 This file is used by the maven-changes-plugin to generate the release notes.
 Useful ways of finding items to add to this file are:
 
-1.  Add items when you fix a bug or add a feature (this makes the 
+1.  Add items when you fix a bug or add a feature (this makes the
 release process easy :-).
 
 2.  Do a JIRA search for tickets closed since the previous release.
 
 3.  Use the report generated by the maven-changelog-plugin to see all
-SVN commits.  Set the project.properties' maven.changelog.range 
+SVN commits.  Set the project.properties' maven.changelog.range
 property to the number of days since the last release.
 
 
@@ -41,6 +41,6 @@ The <action> type attribute can be add,update,fix,remove.
 
     <release version="1.0" date="TBD" description="First release">
     </release>
-    
+
   </body>
 </document>

src/main/java/org/apache/commons/csv/Assertions.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.csv;
+
+/**
+ * Utility class for input parameter validation
+ *
+ * @version $Id$
+ */
+final class Assertions {
+
+    private Assertions() {
+        // can not be instantiated
+    }
+
+    public static void notNull(Object parameter, String parameterName) {
+        if (parameter == null) {
+            throw new IllegalArgumentException("Parameter '" + parameterName + "' must not be null!");
+        }
+    }
+}