Skip to content

Refactor exception generation by JsonParser #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 28, 2023
Merged

Refactor exception generation by JsonParser #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
377294f
Refactor exception generation by JsonParser
cowtowncoder Dec 28, 2023
ed291c0
Remove accidental debug statement
cowtowncoder Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions src/main/java/com/fasterxml/jackson/core/JsonParseException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@ public class JsonParseException
{
private static final long serialVersionUID = 2L; // 2.7

@Deprecated // since 2.7
public JsonParseException(String msg, JsonLocation loc) {
super(msg, loc, null);
}

@Deprecated // since 2.7
public JsonParseException(String msg, JsonLocation loc, Throwable root) {
super(msg, loc, root);
// @since 2.15
public JsonParseException(String msg) {
this(null, msg, null, null);
}

/**
Expand All @@ -39,27 +34,33 @@ public JsonParseException(String msg, JsonLocation loc, Throwable root) {
* @since 2.7
*/
public JsonParseException(JsonParser p, String msg) {
super(p, msg);
this(p, msg, _currentLocation(p), null);
}

// @since 2.7
public JsonParseException(JsonParser p, String msg, Throwable root) {
super(p, msg, root);
public JsonParseException(JsonParser p, String msg, Throwable rootCause) {
this(p, msg, _currentLocation(p), rootCause);
}

// @since 2.7
public JsonParseException(JsonParser p, String msg, JsonLocation loc) {
super(p, msg, loc);
this(p, msg, loc, null);
}

// Canonical constructor
// @since 2.7
public JsonParseException(JsonParser p, String msg, JsonLocation loc, Throwable root) {
super(p, msg, loc, root);
public JsonParseException(JsonParser p, String msg, JsonLocation loc, Throwable rootCause) {
super(p, msg, loc, rootCause);
}

// @since 2.15
public JsonParseException(String msg) {
super(msg);
@Deprecated // since 2.7
public JsonParseException(String msg, JsonLocation loc) {
this(null, msg, loc, null);
}

@Deprecated // since 2.7
public JsonParseException(String msg, JsonLocation loc, Throwable rootCause) {
this(null, msg, loc, rootCause);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ protected final void _throwInternal() {
}

protected final JsonParseException _constructError(String msg, Throwable t) {
return new JsonParseException(this, msg, t);
return new JsonParseException(this, msg, currentLocation(), t);
}

@Deprecated // since 2.11
Expand Down
35 changes: 19 additions & 16 deletions src/main/java/com/fasterxml/jackson/core/exc/StreamReadException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,37 +26,35 @@ public abstract class StreamReadException
*/
protected RequestPayload _requestPayload;

// @since 2.15
protected StreamReadException(String msg) {
this(null, msg, null, null);
}

protected StreamReadException(JsonParser p, String msg) {
super(msg, (p == null) ? null : p.currentLocation());
_processor = p;
this(p, msg, _currentLocation(p), null);
}

protected StreamReadException(JsonParser p, String msg, Throwable root) {
super(msg, (p == null) ? null : p.currentLocation(), root);
_processor = p;
protected StreamReadException(JsonParser p, String msg, Throwable rootCause) {
this(p, msg, _currentLocation(p), rootCause);
}

protected StreamReadException(JsonParser p, String msg, JsonLocation loc) {
super(msg, loc, null);
_processor = p;
this(p, msg, loc, null);
}

protected StreamReadException(String msg, JsonLocation loc, Throwable rootCause) {
this(null, msg, loc, rootCause);
}

// Canonical constructor
// @since 2.13
protected StreamReadException(JsonParser p, String msg, JsonLocation loc,
Throwable rootCause) {
super(msg, loc, rootCause);
_processor = p;
}

protected StreamReadException(String msg, JsonLocation loc, Throwable rootCause) {
super(msg, loc, rootCause);
}

// @since 2.15
protected StreamReadException(String msg) {
super(msg);
}

/**
* Fluent method that may be used to assign originating {@link JsonParser},
* to be accessed using {@link #getProcessor()}.
Expand Down Expand Up @@ -117,4 +115,9 @@ public String getMessage() {
}
return msg;
}

// @since 2.17
protected static JsonLocation _currentLocation(JsonParser p) {
return (p == null) ? null : p.currentLocation();
}
}