Clean up: remove unneeded csv override, remove call to deprecated Jav…

…aPropsParser ctor
FasterXML · Oct 5, 2019 · 571170d · 571170d
1 parent 077432c
commit 571170d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java
@@ -396,16 +396,6 @@ public final void writeFieldName(SerializableString name) throws IOException
         _writeFieldName(name.getValue());
     }
 
-    @Override
-    public final void writeStringField(String fieldName, String value) throws IOException
-    {
-        if (_writeContext.writeFieldName(fieldName) == JsonWriteContext.STATUS_EXPECT_VALUE) {
-            _reportError("Can not write a field name, expecting a value");
-        }
-        _writeFieldName(fieldName);
-        writeString(value);
-    }
-
     private final void _writeFieldName(String name) throws IOException
     {
         // just find the matching index -- must have schema for that

diff --git a/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsFactory.java b/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsFactory.java
@@ -272,17 +272,22 @@ protected IOContext _createContext(Object srcRef, boolean resourceManaged) {
     }
     */
 
+    /*
+    public JavaPropsParser(IOContext ctxt, int parserFeatures, Object inputSource,
+            ObjectCodec codec, Map<?,?> sourceMap)
+     */
+
     @Override
     protected JsonParser _createParser(InputStream in, IOContext ctxt) throws IOException
     {
         Properties props = _loadProperties(in, ctxt);
-        return new JavaPropsParser(ctxt, in, _parserFeatures, _objectCodec, props);
+        return new JavaPropsParser(ctxt, _parserFeatures, in, _objectCodec, props);
     }
 
     @Override
     protected JsonParser _createParser(Reader r, IOContext ctxt) throws IOException {
         Properties props = _loadProperties(r, ctxt);
-        return new JavaPropsParser(ctxt, r, _parserFeatures, _objectCodec, props);
+        return new JavaPropsParser(ctxt, _parserFeatures, r, _objectCodec, props);
     }
 
     @Override

diff --git a/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java b/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java
@@ -288,7 +288,7 @@ public int getText(Writer writer) throws IOException
         writer.write(str);
         return str.length();
     }
-    
+
     @SuppressWarnings("resource")
     @Override
     public byte[] getBinaryValue(Base64Variant variant) throws IOException