diff --git a/arlas-core/src/main/java/io/arlas/server/core/model/request/Aggregation.java b/arlas-core/src/main/java/io/arlas/server/core/model/request/Aggregation.java index c3f5c0dcd..b0fa6af02 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/model/request/Aggregation.java +++ b/arlas-core/src/main/java/io/arlas/server/core/model/request/Aggregation.java @@ -20,7 +20,7 @@ package io.arlas.server.core.model.request; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; import io.arlas.server.core.model.enumerations.AggregatedGeometryEnum; import io.arlas.server.core.model.enumerations.AggregationTypeEnum; @@ -29,7 +29,7 @@ import java.util.List; -@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) public class Aggregation { public AggregationTypeEnum type; public String field; diff --git a/arlas-core/src/main/java/io/arlas/server/core/model/request/Metric.java b/arlas-core/src/main/java/io/arlas/server/core/model/request/Metric.java index 4a8597d10..bafc08d07 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/model/request/Metric.java +++ b/arlas-core/src/main/java/io/arlas/server/core/model/request/Metric.java @@ -20,11 +20,11 @@ package io.arlas.server.core.model.request; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; import io.arlas.server.core.model.enumerations.CollectionFunction; -@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) public class Metric { public String collectField; public CollectionFunction collectFct; diff --git a/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescription.java b/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescription.java index 9d43f96cd..002b6617d 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescription.java +++ b/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescription.java @@ -19,7 +19,6 @@ package io.arlas.server.core.model.response; -import com.fasterxml.jackson.annotation.JsonBackReference; import io.arlas.server.core.model.CollectionReference; import io.dropwizard.jackson.JsonSnakeCase; @@ -27,7 +26,6 @@ @JsonSnakeCase public class CollectionReferenceDescription extends CollectionReference { - @JsonBackReference public Map properties; @Override diff --git a/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescriptionProperty.java b/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescriptionProperty.java index 1e866df55..94263da9e 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescriptionProperty.java +++ b/arlas-core/src/main/java/io/arlas/server/core/model/response/CollectionReferenceDescriptionProperty.java @@ -20,6 +20,7 @@ package io.arlas.server.core.model.response; +import com.fasterxml.jackson.annotation.JsonManagedReference; import io.dropwizard.jackson.JsonSnakeCase; import java.util.Map; @@ -30,6 +31,7 @@ public class CollectionReferenceDescriptionProperty { public FieldType type; public String format; public String hashField; + @JsonManagedReference public Map properties; public boolean taggable=false; public boolean indexed=true;