Skip to content

Commit 571170d

Browse files
committed
Clean up: remove unneeded csv override, remove call to deprecated JavaPropsParser ctor
1 parent 077432c commit 571170d

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvGenerator.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -396,16 +396,6 @@ public final void writeFieldName(SerializableString name) throws IOException
396396
_writeFieldName(name.getValue());
397397
}
398398

399-
@Override
400-
public final void writeStringField(String fieldName, String value) throws IOException
401-
{
402-
if (_writeContext.writeFieldName(fieldName) == JsonWriteContext.STATUS_EXPECT_VALUE) {
403-
_reportError("Can not write a field name, expecting a value");
404-
}
405-
_writeFieldName(fieldName);
406-
writeString(value);
407-
}
408-
409399
private final void _writeFieldName(String name) throws IOException
410400
{
411401
// just find the matching index -- must have schema for that

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,17 +272,22 @@ protected IOContext _createContext(Object srcRef, boolean resourceManaged) {
272272
}
273273
*/
274274

275+
/*
276+
public JavaPropsParser(IOContext ctxt, int parserFeatures, Object inputSource,
277+
ObjectCodec codec, Map<?,?> sourceMap)
278+
*/
279+
275280
@Override
276281
protected JsonParser _createParser(InputStream in, IOContext ctxt) throws IOException
277282
{
278283
Properties props = _loadProperties(in, ctxt);
279-
return new JavaPropsParser(ctxt, in, _parserFeatures, _objectCodec, props);
284+
return new JavaPropsParser(ctxt, _parserFeatures, in, _objectCodec, props);
280285
}
281286

282287
@Override
283288
protected JsonParser _createParser(Reader r, IOContext ctxt) throws IOException {
284289
Properties props = _loadProperties(r, ctxt);
285-
return new JavaPropsParser(ctxt, r, _parserFeatures, _objectCodec, props);
290+
return new JavaPropsParser(ctxt, _parserFeatures, r, _objectCodec, props);
286291
}
287292

288293
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public int getText(Writer writer) throws IOException
288288
writer.write(str);
289289
return str.length();
290290
}
291-
291+
292292
@SuppressWarnings("resource")
293293
@Override
294294
public byte[] getBinaryValue(Base64Variant variant) throws IOException

0 commit comments

Comments
 (0)