Skip to content

Commit

Permalink
Merge pull request #100 from catenax-ng/release/v1.0.0-infra-configur…
Browse files Browse the repository at this point in the history
…ation

fix: added missing component
  • Loading branch information
matbmoser authored Jun 28, 2023
2 parents 638404d + c7b9e84 commit 0ccfcb0
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 2 deletions.
2 changes: 1 addition & 1 deletion consumer-backend/productpass/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</parent>
<groupId>org.eclipse.tractusx</groupId>
<artifactId>productpass</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Catena-X Digital Product Passport Backend</name>
<description>Product Passport Consumer Backend System for Product Passport Consumer Frontend Application</description>
Expand Down
2 changes: 1 addition & 1 deletion consumer-backend/productpass/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<h1 style="display:flex; align-items: center;"><img src="../../docs/catena-x-logo.svg"/>&nbsp;&nbsp;Digital Product Pass Backend</h1>


<h2><strong>Version</strong>: <span style="color: cyan">0.8.0-SNAPSHOT</span><h2>
<h2><strong>Version</strong>: <span style="color: cyan">1.0.0-SNAPSHOT</span><h2>

<br>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -92,6 +94,11 @@ public void setQuerySpec(QuerySpec querySpec) {

@JsonInclude(JsonInclude.Include.NON_NULL)
public static class QuerySpec {

@JsonProperty("filterExpression")
List<FilterExpression> filterExpression;


@JsonProperty("offset")
Integer offset;

Expand All @@ -116,6 +123,57 @@ public QuerySpec(Integer offset, Integer limit, String filter, Range range, Stri
public QuerySpec() {
}

public List<FilterExpression> getFilterExpression() {
return filterExpression;
}

public void setFilterExpression(List<FilterExpression> 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")
Expand Down

0 comments on commit 0ccfcb0

Please sign in to comment.