Skip to content

Commit eb6d2b1

Browse files
committed
Minor cosmetic changes wrt tests for #2013
1 parent 7f1d04e commit eb6d2b1

File tree

5 files changed

+187
-208
lines changed

5 files changed

+187
-208
lines changed

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -804,9 +804,9 @@ public JsonGenerator createGenerator(File f, JsonEncoding enc) throws JacksonExc
804804
*
805805
* @since 3.0
806806
*/
807-
public JsonGenerator createGenerator(Path p, JsonEncoding enc) throws JacksonException {
808-
_assertNotNull("p", p);
809-
return _streamFactory.createGenerator(_serializerProvider(), p, enc);
807+
public JsonGenerator createGenerator(Path path, JsonEncoding enc) throws JacksonException {
808+
_assertNotNull("path", path);
809+
return _streamFactory.createGenerator(_serializerProvider(), path, enc);
810810
}
811811

812812
/**

src/main/java/com/fasterxml/jackson/databind/ObjectReader.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1224,17 +1224,17 @@ public <T> T readValue(File f) throws JacksonException
12241224
* Value return is either newly constructed, or root value that
12251225
* was specified with {@link #withValueToUpdate(Object)}.
12261226
*
1227-
* @param p Path that contains content to read
1227+
* @param path Path that contains content to read
12281228
*
12291229
* @since 3.0
12301230
*/
12311231
@SuppressWarnings("unchecked")
1232-
public <T> T readValue(Path p) throws JacksonException
1232+
public <T> T readValue(Path path) throws JacksonException
12331233
{
1234-
_assertNotNull("p", p);
1234+
_assertNotNull("path", path);
12351235
DeserializationContextExt ctxt = _deserializationContext();
12361236
return (T) _bindAndClose(ctxt,
1237-
_considerFilter(_parserFactory.createParser(ctxt, p), false));
1237+
_considerFilter(_parserFactory.createParser(ctxt, path), false));
12381238
}
12391239

12401240
/**
@@ -1749,9 +1749,9 @@ protected InputStream _inputStream(File f) throws JacksonException {
17491749
}
17501750
}
17511751

1752-
protected InputStream _inputStream(Path p) throws JacksonException {
1752+
protected InputStream _inputStream(Path path) throws JacksonException {
17531753
try {
1754-
return Files.newInputStream(p);
1754+
return Files.newInputStream(path);
17551755
} catch (IOException e) {
17561756
throw WrappedIOException.construct(e);
17571757
}

0 commit comments

Comments
 (0)