Skip to content
Open
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
29 changes: 16 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
id 'cl.franciscosolis.sonatype-central-upload' version '1.0.3'
id("java")
id("checkstyle")
id "nebula.lint" version "17.8.0"
id "nebula.lint" version "21.1.3"
}

compileJava.options.encoding = "UTF-8"
Expand Down Expand Up @@ -152,18 +152,21 @@ if (!project.hasProperty('skip.signing')) {


dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
runtimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
testImplementation 'org.testcontainers:testcontainers-bom:1.20.1'
testImplementation 'org.testcontainers:testcontainers:1.20.1'
testImplementation 'org.testcontainers:junit-jupiter:1.20.1'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0'
api 'com.fasterxml.jackson.core:jackson-core:2.17.0'
api 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2'
api('org.openapitools:jackson-databind-nullable:0.2.6') {exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'}
implementation 'commons-io:commons-io:2.18.0'
api platform('tools.jackson:jackson-bom:3.1.1')
api 'tools.jackson.core:jackson-core'
api 'tools.jackson.core:jackson-databind'
api 'org.openapitools:jackson-databind-nullable:0.2.10'
api 'com.fasterxml.jackson.core:jackson-annotations'
api 'commons-io:commons-io:2.18.0'
testImplementation platform('org.junit:junit-bom:5.14.3')
testImplementation platform('org.testcontainers:testcontainers-bom:2.0.4')
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:testcontainers-junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.slf4j:slf4j-api:1.7.36'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.36'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

apply from: 'build-extras.gradle'
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/github/open_policy_agent/opa/OPAClient.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package io.github.open_policy_agent.opa;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.github.open_policy_agent.opa.openapi.OpaApiClient;
import io.github.open_policy_agent.opa.openapi.models.errors.SDKError;
import io.github.open_policy_agent.opa.openapi.models.errors.ServerError;
Expand Down Expand Up @@ -31,6 +28,9 @@
import io.github.open_policy_agent.opa.openapi.models.shared.SuccessfulPolicyResponseWithStatusCode;
import io.github.open_policy_agent.opa.openapi.utils.HTTPClient;
import io.github.open_policy_agent.opa.utils.OPAHTTPClient;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.ObjectMapper;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/github/open_policy_agent/opa/OPAResult.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.open_policy_agent.opa;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.ObjectMapper;

/**
* This class encapsulates a result of a previous OPA request for deferred
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
package io.github.open_policy_agent.opa.openapi;

import com.fasterxml.jackson.core.type.TypeReference;
import io.github.open_policy_agent.opa.openapi.models.errors.BatchServerError;
import io.github.open_policy_agent.opa.openapi.models.errors.ClientError;
import io.github.open_policy_agent.opa.openapi.models.errors.SDKError;
Expand Down Expand Up @@ -49,6 +48,8 @@
import io.github.open_policy_agent.opa.openapi.utils.SpeakeasyHTTPClient;
import io.github.open_policy_agent.opa.openapi.utils.Utils.JsonShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;

import java.io.InputStream;
import java.lang.Boolean;
import java.lang.Exception;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.type.TypeReference;
import io.github.open_policy_agent.opa.openapi.models.shared.Explain;
import io.github.open_policy_agent.opa.openapi.models.shared.GzipAcceptEncoding;
import io.github.open_policy_agent.opa.openapi.models.shared.GzipContentEncoding;
import io.github.open_policy_agent.opa.openapi.utils.LazySingletonValue;
import io.github.open_policy_agent.opa.openapi.utils.SpeakeasyMetadata;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;

import java.lang.Boolean;
import java.lang.Override;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.type.TypeReference;
import io.github.open_policy_agent.opa.openapi.models.shared.Explain;
import io.github.open_policy_agent.opa.openapi.models.shared.GzipAcceptEncoding;
import io.github.open_policy_agent.opa.openapi.models.shared.GzipContentEncoding;
import io.github.open_policy_agent.opa.openapi.utils.LazySingletonValue;
import io.github.open_policy_agent.opa.openapi.utils.SpeakeasyMetadata;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;

import java.lang.Boolean;
import java.lang.Override;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.type.TypeReference;
import io.github.open_policy_agent.opa.openapi.models.shared.Explain;
import io.github.open_policy_agent.opa.openapi.models.shared.GzipAcceptEncoding;
import io.github.open_policy_agent.opa.openapi.utils.LazySingletonValue;
import io.github.open_policy_agent.opa.openapi.utils.SpeakeasyMetadata;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;

import java.lang.Boolean;
import java.lang.Override;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.type.TypeReference;
import io.github.open_policy_agent.opa.openapi.models.shared.Explain;
import io.github.open_policy_agent.opa.openapi.models.shared.GzipAcceptEncoding;
import io.github.open_policy_agent.opa.openapi.models.shared.GzipContentEncoding;
import io.github.open_policy_agent.opa.openapi.utils.LazySingletonValue;
import io.github.open_policy_agent.opa.openapi.utils.SpeakeasyMetadata;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;

import java.lang.Boolean;
import java.lang.Override;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.type.TypeReference;
import io.github.open_policy_agent.opa.openapi.utils.LazySingletonValue;
import io.github.open_policy_agent.opa.openapi.utils.SpeakeasyMetadata;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;

import java.lang.Boolean;
import java.lang.Override;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
*/
package io.github.open_policy_agent.opa.openapi.models.operations;

import com.fasterxml.jackson.core.type.TypeReference;
import io.github.open_policy_agent.opa.openapi.utils.LazySingletonValue;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;

import java.lang.Boolean;
import java.lang.Exception;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
package io.github.open_policy_agent.opa.openapi.models.shared;

import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.github.open_policy_agent.opa.openapi.utils.OneOfDeserializer;
import io.github.open_policy_agent.opa.openapi.utils.TypedObject;
import io.github.open_policy_agent.opa.openapi.utils.Utils.JsonShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils.TypeReferenceWithShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.lang.Boolean;
import java.lang.Double;
import java.lang.Object;
import java.lang.Override;
import java.lang.String;
import java.lang.SuppressWarnings;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -103,7 +103,6 @@ public int hashCode() {
return Objects.hash(value.value());
}

@SuppressWarnings("serial")
public static final class _Deserializer extends OneOfDeserializer<Input> {

public _Deserializer() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
package io.github.open_policy_agent.opa.openapi.models.shared;

import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.github.open_policy_agent.opa.openapi.utils.OneOfDeserializer;
import io.github.open_policy_agent.opa.openapi.utils.TypedObject;
import io.github.open_policy_agent.opa.openapi.utils.Utils.JsonShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils.TypeReferenceWithShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.lang.Override;
import java.lang.String;
import java.lang.SuppressWarnings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
package io.github.open_policy_agent.opa.openapi.models.shared;

import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.github.open_policy_agent.opa.openapi.utils.OneOfDeserializer;
import io.github.open_policy_agent.opa.openapi.utils.TypedObject;
import io.github.open_policy_agent.opa.openapi.utils.Utils.JsonShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils.TypeReferenceWithShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.lang.Boolean;
import java.lang.Double;
import java.lang.Object;
import java.lang.Override;
import java.lang.String;
import java.lang.SuppressWarnings;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -98,7 +98,6 @@ public int hashCode() {
return Objects.hash(value.value());
}

@SuppressWarnings("serial")
public static final class _Deserializer extends OneOfDeserializer<Replace> {

public _Deserializer() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
package io.github.open_policy_agent.opa.openapi.models.shared;

import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.github.open_policy_agent.opa.openapi.utils.OneOfDeserializer;
import io.github.open_policy_agent.opa.openapi.utils.TypedObject;
import io.github.open_policy_agent.opa.openapi.utils.Utils.JsonShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils.TypeReferenceWithShape;
import io.github.open_policy_agent.opa.openapi.utils.Utils;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.lang.Boolean;
import java.lang.Double;
import java.lang.Object;
import java.lang.Override;
import java.lang.String;
import java.lang.SuppressWarnings;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -103,7 +103,6 @@ public int hashCode() {
return Objects.hash(value.value());
}

@SuppressWarnings("serial")
public static final class _Deserializer extends OneOfDeserializer<Result> {

public _Deserializer() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,18 @@
*/
package io.github.open_policy_agent.opa.openapi.utils;

import java.io.IOException;
import tools.jackson.core.JsonGenerator;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.SerializationContext;
import tools.jackson.databind.annotation.JsonDeserialize;
import tools.jackson.databind.annotation.JsonSerialize;
import tools.jackson.databind.deser.std.StdDeserializer;
import tools.jackson.databind.ser.std.StdSerializer;

import java.math.BigDecimal;
import java.util.Objects;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;

// Internal API only

// Note that Jackson 2.16.1 does not support @JsonValue and @JsonFormat combined so we must use
Expand Down Expand Up @@ -63,30 +60,26 @@ public boolean equals(Object obj) {
return Objects.equals(value, other.value);
}

@SuppressWarnings("serial")
public static final class Serializer extends StdSerializer<BigDecimalString> {

protected Serializer() {
super(BigDecimalString.class);
}

@Override
public void serialize(BigDecimalString value, JsonGenerator g, SerializerProvider provider)
throws IOException, JsonProcessingException {
public void serialize(BigDecimalString value, JsonGenerator g, SerializationContext ctxt) {
g.writeString(value.value.toString());
}
}

@SuppressWarnings("serial")
public static final class Deserializer extends StdDeserializer<BigDecimalString> {

protected Deserializer() {
super(BigDecimalString.class);
}

@Override
public BigDecimalString deserialize(JsonParser p, DeserializationContext ctxt)
throws IOException, JacksonException {
public BigDecimalString deserialize(JsonParser p, DeserializationContext ctxt) {
String s = p.readValueAs(String.class);
return new BigDecimalString(new BigDecimal(s));
}
Expand Down
Loading