Skip to content
Closed
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
3 changes: 2 additions & 1 deletion cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ repositories {
dependencies {
implementation(project(":opa-evaluator"))
implementation(project(":opa-services"))
implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1")
implementation(platform("tools.jackson:jackson-bom:3.2.0"))
implementation("tools.jackson.core:jackson-databind")
implementation("info.picocli:picocli:4.7.7")
implementation("org.apache.commons:commons-compress:1.28.0")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package io.github.open_policy_agent.opa.cli;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import io.github.open_policy_agent.opa.ast.builtin.BuiltinRegistry;
import io.github.open_policy_agent.opa.bundle.FileSystemBundleLoader;
import io.github.open_policy_agent.opa.bundle.TarballBundleLoader;
Expand Down Expand Up @@ -31,6 +29,10 @@
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
import picocli.CommandLine.Parameters;
import tools.jackson.core.JacksonException;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.ObjectWriter;
import tools.jackson.databind.json.JsonMapper;

@Command(name = "eval", mixinStandardHelpOptions = true)
public class Eval implements Callable<Integer> {
Expand Down Expand Up @@ -134,8 +136,8 @@ public Integer call() {

if (showCapabilities) {
try {
System.out.println(new ObjectMapper().writeValueAsString(BuiltinRegistry.generateCapabilities()));
} catch (IOException e) {
System.out.println(JsonMapper.shared().writeValueAsString(BuiltinRegistry.generateCapabilities()));
} catch (JacksonException e) {
System.err.println(e.getMessage());
return 1;
}
Expand Down Expand Up @@ -181,7 +183,7 @@ public Integer call() {
showMetrics = true;
}

final ObjectMapper objectMapper = new ObjectMapper();
final ObjectMapper objectMapper = JsonMapper.shared();

final List<Metrics> allMetrics = new ArrayList<>(count);
final List<QueryTracer> allTracers = new ArrayList<>(count);
Expand Down Expand Up @@ -217,7 +219,7 @@ public Integer call() {
} else {
inputDoc = objectMapper.readValue(this.input.toFile(), Object.class);
}
} catch (IOException e) {
} catch (JacksonException e) {
System.err.println("Error reading input: " + e.getMessage());
return 1;
}
Expand Down Expand Up @@ -332,7 +334,7 @@ public Integer call() {
? objectMapper.writerWithDefaultPrettyPrinter()
: objectMapper.writer();
System.out.println(writer.writeValueAsString(lastResults));
} catch (IOException e) {
} catch (JacksonException e) {
System.err.println("Error serializing results: " + e.getMessage());
return 1;
}
Expand Down
10 changes: 4 additions & 6 deletions opa-builtins/opa-builtins-json/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ repositories {
dependencies {
api(project(":opa-evaluator"))

implementation("com.github.java-json-tools:json-patch:1.13")
implementation("com.networknt:json-schema-validator:1.5.5")
implementation(platform("com.fasterxml.jackson:jackson-bom:2.22.0"))
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
implementation("com.networknt:json-schema-validator:3.0.5")
implementation(platform("tools.jackson:jackson-bom:3.2.0"))
implementation("tools.jackson.core:jackson-databind")
implementation("tools.jackson.dataformat:jackson-dataformat-yaml")
// RegoValueModule (auto-registered via Jackson SPI) provides (de)serializers for the AST
// types so they don't need to carry annotations.
runtimeOnly(project(":opa-jackson"))
Expand Down
Loading
Loading