Skip to content

Commit

Permalink
[CSV-184] Make the method CSVRecord#putIn(Map) public.
Browse files Browse the repository at this point in the history
  • Loading branch information
garydgregory committed Mar 23, 2020
1 parent ea7ffd7 commit c2f46df
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Expand Up @@ -23,7 +23,7 @@
<version>50</version>
</parent>
<artifactId>commons-csv</artifactId>
<version>1.8.1-SNAPSHOT</version>
<version>1.9-SNAPSHOT</version>
<name>Apache Commons CSV</name>
<url>https://commons.apache.org/proper/commons-csv/</url>
<description>The Apache Commons CSV library provides a simple interface for reading and writing CSV files of various types.</description>
Expand Down Expand Up @@ -137,11 +137,11 @@
</distributionManagement>

<properties>
<commons.release.version>1.8</commons.release.version>
<commons.release.version>1.9</commons.release.version>
<commons.release.desc>(Java 8)</commons.release.desc>
<!-- The RC version used in the staging repository URL. -->
<commons.rc.version>RC2</commons.rc.version>
<commons.bc.version>1.7</commons.bc.version>
<commons.bc.version>1.8</commons.bc.version>
<commons.componentid>csv</commons.componentid>
<commons.module.name>org.apache.commons.csv</commons.module.name>
<commons.jira.id>CSV</commons.jira.id>
Expand Down
5 changes: 3 additions & 2 deletions src/changes/changes.xml
Expand Up @@ -38,13 +38,14 @@
<title>Apache Commons CSV Release Notes</title>
</properties>
<body>
<release version="1.8.1" date="2020-MM-DD" description="Bug fix release (Java 8)">
<release version="1.9" date="2020-MM-DD" description="Bug fix release (Java 8)">
<action type="add" dev="ggregory" due-to="dota17">Add testcases for CSVRecord with get(Enum) and toString. #54.</action>
<action type="update" dev="ggregory" due-to="Amey Jadiye">Replace FindBugs with SpotBugs #56.</action>
<action type="update" dev="ggregory" due-to="Chen">Javadoc typo in CSVFormat let's -> lets #57.</action>
<action issue="CSV-259" type="fix" dev="ggregory" due-to="Chen">CSVFormat.printWithEscapes throws StringIndexOutOfBoundsException when value is Reader #61.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">org.mockito:mockito-core 3.2.4 -> 3.3.3.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">maven-pmd-plugin 3.12.0 -> 3.13.0.</action>
<action issue="CSV-184" type="add" dev="ggregory" due-to="Gaurav Agarwal, M. Steiger, Gary Gregory">Make the method CSVRecord#putIn(Map) public.</action>
Make the method CSVRecord#putIn(Map) public
</release>
<release version="1.8" date="2020-02-01" description="Feature and bug fix release (Java 8).
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/apache/commons/csv/CSVRecord.java
Expand Up @@ -266,8 +266,9 @@ public Iterator<String> iterator() {
* @param map
* The Map to populate.
* @return the given map.
* @since 1.9
*/
<M extends Map<String, String>> M putIn(final M map) {
public <M extends Map<String, String>> M putIn(final M map) {
if (getHeaderMapRaw() == null) {
return map;
}
Expand Down

0 comments on commit c2f46df

Please sign in to comment.