Merge branch '2.11'

Author: cowtowncoder

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/NullReader122Test.java

@@ -17,7 +17,7 @@ public void testEmptyStream() throws Exception {
             /*Object ob =*/ r.readValue((Reader) null);
             fail("Should not pass");
         } catch (IllegalArgumentException e) {
-            verifyException(e, "Argument \"src\" is null");
+            verifyException(e, "Argument \"r\" is null");
         }
     }
 }

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsFactory.java

@@ -297,7 +297,7 @@ protected Properties _loadProperties(Reader r0, IOContext ctxt) throws IOExcepti
     {
         Properties props = new Properties();
         // May or may not want to close the reader, so...
-        if (ctxt.isResourceManaged()) {
+        if (ctxt.isResourceManaged() || isEnabled(StreamReadFeature.AUTO_CLOSE_SOURCE)) {
             try (Reader r = r0) {
                 props.load(r);
             }

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/io/Latin1Reader.java

@@ -96,8 +96,12 @@ public int getReadCharsCount() {
     @Override
     public void close() throws IOException
     {
-        _inputSource = null;
-        freeBuffers();
+        InputStream in = _inputSource;
+        if (in != null) {
+            _inputSource = null;
+            freeBuffers();
+            in.close();
+        }
     }
 
     private char[] _tmpBuffer = null;

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/StreamClosingTest.java

@@ -0,0 +1,57 @@
+package com.fasterxml.jackson.dataformat.javaprop;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.javaprop.testutil.CloseStateInputStream;
+import com.fasterxml.jackson.dataformat.javaprop.testutil.CloseStateReader;
+
+@SuppressWarnings("resource")
+public class StreamClosingTest extends ModuleTestBase
+{
+    // for [dataformats-text#179]
+    public static class Bean179 {
+        public int value;
+
+        @Override public String toString() { return "[value: "+value+"]"; }
+    }
+
+    private final ObjectMapper PROPS_MAPPER = mapperForProps();
+
+    public void testInputStreamClosing() throws Exception
+    {
+        // by default, SHOULD close it:
+        CloseStateInputStream in = CloseStateInputStream.forString("value = 42");
+        assertFalse(in.closed);
+        Bean179 result = PROPS_MAPPER.readValue(in, Bean179.class);
+        assertNotNull(result);
+        assertTrue(in.closed);
+
+        // but not if reconfigured
+        in = CloseStateInputStream.forString("value = 42");
+        assertFalse(in.closed);
+        result = PROPS_MAPPER.readerFor(Bean179.class)
+                .without(JsonParser.Feature.AUTO_CLOSE_SOURCE)
+                .readValue(in);
+        assertNotNull(result);
+        assertTrue(in.closed);
+    }
+
+    public void testReaderClosing() throws Exception
+    {
+        // by default, SHOULD close it:
+        CloseStateReader r = CloseStateReader.forString("value = 42");
+        assertFalse(r.closed);
+        Bean179 result = PROPS_MAPPER.readValue(r, Bean179.class);
+        assertNotNull(result);
+        assertTrue(r.closed);
+
+        // but not if reconfigured
+        r = CloseStateReader.forString("value = 42");
+        assertFalse(r.closed);
+        result = PROPS_MAPPER.readerFor(Bean179.class)
+                .without(JsonParser.Feature.AUTO_CLOSE_SOURCE)
+                .readValue(r);
+        assertNotNull(result);
+        assertTrue(r.closed);
+    }
+}

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/testutil/CloseStateInputStream.java

@@ -0,0 +1,24 @@
+package com.fasterxml.jackson.dataformat.javaprop.testutil;
+
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class CloseStateInputStream extends FilterInputStream
+{
+    public boolean closed = false;
+
+    public CloseStateInputStream(InputStream in) { super(in); }
+
+    @Override
+    public void close() throws IOException {
+        closed = true;
+        super.close();
+    }
+
+    public static CloseStateInputStream forString(String input) throws IOException {
+        return new CloseStateInputStream(new ByteArrayInputStream(
+                input.getBytes("UTF-8")));
+    }
+}

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/testutil/CloseStateReader.java

@@ -0,0 +1,20 @@
+package com.fasterxml.jackson.dataformat.javaprop.testutil;
+
+import java.io.*;
+
+public class CloseStateReader extends FilterReader
+{
+    public boolean closed = false;
+
+    public CloseStateReader(Reader r) { super(r); }
+
+    @Override
+    public void close() throws IOException {
+        closed = true;
+        super.close();
+    }
+
+    public static CloseStateReader forString(String input) throws IOException {
+        return new CloseStateReader(new StringReader(input));
+    }
+}

release-notes/CREDITS-2.x

@@ -89,6 +89,11 @@ Piyush Kumar (piyushkumar13@github)
 * Reported #163: (yaml) `SequenceWriter` does not create multiple docs in a single yaml file
  (2.10.2)
 
+Francisco Colmenares (fcolmenarez@github)
+* Reported #179 (properties): `JavaPropsMapper` doesn't close the .properties file
+  properly after reading
+ (2.10.4)
+
 Tyler Carpenter-Rivers (tyler2cr@github)
 #7: Add `CsvParser.Feature.EMPTY_STRING_AS_NULL` to allow coercing empty Strings
   into `null` values

release-notes/VERSION-2.x

@@ -19,6 +19,9 @@ Modules:
 2.10.4 (not yet released)
 
 #178: Upgrade SnakeYAML to 1.26 (from 1.24)
+#179 (properties): `JavaPropsMapper` doesn't close the .properties file
+   properly after reading
+ (reported by Francisco C)
 
 2.10.3 (03-Mar-2020)