From c7b9e84997b1f227c7fbaf8f16bd65a8ed43d3c3 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Wed, 28 Jun 2023 17:17:33 +0200 Subject: [PATCH] fix: added missing component --- consumer-backend/productpass/pom.xml | 2 +- consumer-backend/productpass/readme.md | 2 +- .../models/negotiation/CatalogRequest.java | 58 +++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/consumer-backend/productpass/pom.xml b/consumer-backend/productpass/pom.xml index 57dbc46a3..7e5119f44 100644 --- a/consumer-backend/productpass/pom.xml +++ b/consumer-backend/productpass/pom.xml @@ -33,7 +33,7 @@ org.eclipse.tractusx productpass - 0.8.0-SNAPSHOT + 1.0.0-SNAPSHOT jar Catena-X Digital Product Passport Backend Product Passport Consumer Backend System for Product Passport Consumer Frontend Application diff --git a/consumer-backend/productpass/readme.md b/consumer-backend/productpass/readme.md index b35102b2a..e4c4febad 100644 --- a/consumer-backend/productpass/readme.md +++ b/consumer-backend/productpass/readme.md @@ -23,7 +23,7 @@

  Digital Product Pass Backend

-

Version: 0.8.0-SNAPSHOT

+

Version: 1.0.0-SNAPSHOT


diff --git a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java index 7406875e6..be1f539a5 100644 --- a/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java +++ b/consumer-backend/productpass/src/main/java/org/eclipse/tractusx/productpass/models/negotiation/CatalogRequest.java @@ -29,6 +29,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; +import java.util.List; + @JsonInclude(JsonInclude.Include.NON_NULL) public class CatalogRequest { @JsonProperty("@context") @@ -92,6 +94,11 @@ public void setQuerySpec(QuerySpec querySpec) { @JsonInclude(JsonInclude.Include.NON_NULL) public static class QuerySpec { + + @JsonProperty("filterExpression") + List filterExpression; + + @JsonProperty("offset") Integer offset; @@ -116,6 +123,57 @@ public QuerySpec(Integer offset, Integer limit, String filter, Range range, Stri public QuerySpec() { } + public List getFilterExpression() { + return filterExpression; + } + + public void setFilterExpression(List filterExpression) { + this.filterExpression = filterExpression; + } + @JsonInclude(JsonInclude.Include.NON_NULL) + public static class FilterExpression{ + @JsonProperty("operandLeft") + String operandLeft; + + @JsonProperty("operator") + String operator; + + @JsonProperty("operandRight") + String operandRight; + + public FilterExpression(String operandLeft, String operator, String operandRight) { + this.operandLeft = operandLeft; + this.operator = operator; + this.operandRight = operandRight; + } + + public FilterExpression() { + } + + public String getOperandLeft() { + return operandLeft; + } + + public void setOperandLeft(String operandLeft) { + this.operandLeft = operandLeft; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getOperandRight() { + return operandRight; + } + + public void setOperandRight(String operandRight) { + this.operandRight = operandRight; + } + } @JsonInclude(JsonInclude.Include.NON_NULL) public static class Range { @JsonProperty("from")