Skip to content
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.

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

Bump com.fasterxml.jackson.core:jackson-databind from 2.15.3 to 2.16.0 #129

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<properties>
<jdk.version>1.8</jdk.version>
<jackson.version>2.15.3</jackson.version>
<jackson.version>2.16.0</jackson.version>
<jsr.version>3.0.2</jsr.version>
<junit.version>4.13.2</junit.version>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
Expand Down
9 changes: 4 additions & 5 deletions src/main/software/amazon/event/ruler/JsonRuleCompiler.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package software.amazon.event.ruler;

import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.*;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we avoid importing wildcards in this repository? For the long term, we should probably add a checkstyle rule to have some rules around this, and apply them automatically upon building this package.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes we should. Let me send a small PR to fix this.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import software.amazon.event.ruler.input.ParseException;

import java.io.IOException;
Expand Down Expand Up @@ -50,7 +47,9 @@
*/
public class JsonRuleCompiler {

private static final JsonFactory JSON_FACTORY = new JsonFactory();
private static final JsonFactory JSON_FACTORY = JsonFactory.builder()
.configure(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION, true)
.build();

private JsonRuleCompiler() { }

Expand Down
9 changes: 4 additions & 5 deletions src/main/software/amazon/event/ruler/RuleCompiler.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
import java.util.Map;
import java.util.Set;

import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.*;
import software.amazon.event.ruler.input.ParseException;

import static software.amazon.event.ruler.input.DefaultParser.getParser;
Expand All @@ -33,7 +30,9 @@
*/
public final class RuleCompiler {

private static final JsonFactory JSON_FACTORY = new JsonFactory();
private static final JsonFactory JSON_FACTORY = JsonFactory.builder()
.configure(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION, true)
.build();

private RuleCompiler() {
throw new UnsupportedOperationException("You can't create instance of utility class.");
Expand Down