Fix #91

Author: cowtowncoder

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

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.core.base.GeneratorBase;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.json.JsonWriteContext;
-import com.fasterxml.jackson.dataformat.javaprop.io.JPropEscapes;
 import com.fasterxml.jackson.dataformat.javaprop.io.JPropWriteContext;
 import com.fasterxml.jackson.dataformat.javaprop.util.Markers;
 
@@ -206,6 +205,8 @@ public JsonStreamContext getOutputContext() {
     /**********************************************************************
      */
 
+// varies between impls so:
+//    @Override public void writeFieldName(String name) throws IOException
     @Override
     public void writeFieldName(String name) throws IOException
     {
@@ -230,12 +231,11 @@ public void writeFieldName(String name) throws IOException
                 _basePath.append(sep);
             }
         }
-        // Note that escaping needs to be applied now...
-        
-        JPropEscapes.appendKey(_basePath, name);
-        // NOTE: we do NOT yet write the key; wait until we have value; just append to path
+        _appendFieldName(_basePath, name);
     }
 
+    protected abstract void _appendFieldName(StringBuilder path, String name);
+
     /*
     /**********************************************************
     /* Public API: structural output

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

@@ -210,8 +210,7 @@ public void writeValue(Properties targetProps, Object value, JavaPropsSchema sch
         if (targetProps == null) {
             throw new IllegalArgumentException("Can not pass null Properties as target");
         }
-        JavaPropsGenerator g = ((JavaPropsFactory) getFactory())
-                .createGenerator(targetProps);
+        JavaPropsGenerator g = getFactory().createGenerator(targetProps);
         if (schema != null) {
             g.setSchema(schema);
         }
@@ -229,7 +228,7 @@ public void writeValue(Properties targetProps, Object value, JavaPropsSchema sch
     public Properties writeValueAsProperties(Object value)
         throws IOException
     {
-        Properties props = new Properties();
+        final Properties props = new Properties();
         writeValue(props, value);
         return props;
     }

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/impl/PropertiesBackedGenerator.java

@@ -32,6 +32,10 @@ public PropertiesBackedGenerator(IOContext ctxt, Properties props,
     {
         super(ctxt, stdFeatures, codec);
         _props = props;
+
+        // Since this is not physically encoding properties, should NOT try
+        // to attempt writing headers. Easy way is to just fake we already did it
+        _headerChecked = true;
     }
 
     /*
@@ -66,6 +70,12 @@ public void flush() throws IOException { }
     @Override
     protected void _releaseBuffers() { }
 
+    @Override
+    protected void _appendFieldName(StringBuilder path, String name) {
+        // No escaping should be applied
+        path.append(name);
+    }
+    
     /*
     /**********************************************************
     /* Internal methods; escaping writes

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/impl/WriterBackedGenerator.java

@@ -129,6 +129,13 @@ protected void _flushBuffer() throws IOException
         }
     }
 
+    @Override
+    protected void _appendFieldName(StringBuilder path, String name) {
+        // Note that escaping needs to be applied now...
+        JPropEscapes.appendKey(_basePath, name);
+        // NOTE: we do NOT yet write the key; wait until we have value; just append to path
+    }
+
     /*
     /**********************************************************
     /* Internal methods; escaping writes

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

@@ -51,4 +51,24 @@ public void testWithCustomSchema() throws Exception
         assertEquals(1, m2.size());
         assertEquals("foo", m2.get("z"));
     }
+
+    static class TestObject91 {
+        Map<String, String> values = new HashMap<>();
+        public Map<String, String> getValues() {
+             return values;
+        }
+        public void setValues(Map<String, String> values) {
+             this.values = values;
+        }
+    }
+
+    // [dataformats-text#91]
+    public void testEscapingWithReadPropertiesAs() throws Exception
+    {
+        TestObject91 expected = new TestObject91();
+        expected.values.put("foo:bar", "1");
+        Properties properties = MAPPER.writeValueAsProperties(expected);
+        TestObject91 actual = MAPPER.readPropertiesAs(properties, TestObject91.class);
+        assertEquals(expected.values, actual.values);
+    }
 }

release-notes/CREDITS-2.x

@@ -37,3 +37,7 @@ Gowtam Lal (baconmania@github)
 * Reported #68: (yaml) When field names are reserved words, they should be
   written out with quotes
  (2.9.9)
+
+Dimitris Mandalidis (dmandalidis@github)
+* Reported #91: (properties) `JavaPropsGenerator#writeFieldName()` should not escape property keys
+ (2.9.9)

release-notes/VERSION-2.x

@@ -16,6 +16,8 @@ Modules:
  (reported by Gowtam L)
 #90: (yaml) Exception when decoding Jackson-encoded `Base64` binary value in YAML
  (reported by Tanguy L)
+#91: (properties) `JavaPropsGenerator#writeFieldName()` should not escape property keys
+ (reported by Dimitris M)
 #122: (csv) `readValues(null)` causes infinite loop
  (reported by andyeko@github) 
 #123: (yaml) YAML Anchor, reference fails with simple example