diff --git a/changes.md b/changes.md index 16729cca899..f82e3b072c6 100644 --- a/changes.md +++ b/changes.md @@ -8,6 +8,13 @@ +
+Changed Property(s) + +- :warning: changed property `filter` of type `SearchSorting` from type `SearchQueryExpression` to `SearchQuery` +
+ +
Added Property(s) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSorting.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSorting.java index 4ccabfbe32f..ff72f8245b3 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSorting.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSorting.java @@ -79,7 +79,7 @@ public interface SearchSorting { */ @Valid @JsonProperty("filter") - public SearchQueryExpression getFilter(); + public SearchQuery getFilter(); /** *

Use any searchable field of the resource as sort criterion, or "score" to sort by relevance score calculated by the API.

@@ -121,7 +121,7 @@ public interface SearchSorting { * @param filter value to be set */ - public void setFilter(final SearchQueryExpression filter); + public void setFilter(final SearchQuery filter); /** * factory method @@ -165,7 +165,7 @@ public static SearchSorting deepCopy(@Nullable final SearchSorting template) { instance.setOrder(template.getOrder()); instance.setMode(template.getMode()); instance.setFieldType(template.getFieldType()); - instance.setFilter(com.commercetools.api.models.search.SearchQueryExpression.deepCopy(template.getFilter())); + instance.setFilter(com.commercetools.api.models.search.SearchQuery.deepCopy(template.getFilter())); return instance; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingBuilder.java index e3bb0c26d0b..12dfdaf3613 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingBuilder.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingBuilder.java @@ -39,7 +39,7 @@ public class SearchSortingBuilder implements Builder { private com.commercetools.api.models.search.SearchFieldType fieldType; @Nullable - private com.commercetools.api.models.search.SearchQueryExpression filter; + private com.commercetools.api.models.search.SearchQuery filter; /** *

Use any searchable field of the resource as sort criterion, or "score" to sort by relevance score calculated by the API.

@@ -104,8 +104,8 @@ public SearchSortingBuilder fieldType( */ public SearchSortingBuilder filter( - Function builder) { - this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryExpressionBuilder.of()).build(); + Function builder) { + this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryBuilder.of()).build(); return this; } @@ -116,8 +116,8 @@ public SearchSortingBuilder filter( */ public SearchSortingBuilder withFilter( - Function builder) { - this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryExpressionBuilder.of()); + Function builder) { + this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryBuilder.of()); return this; } @@ -127,8 +127,7 @@ public SearchSortingBuilder withFilter( * @return Builder */ - public SearchSortingBuilder filter( - @Nullable final com.commercetools.api.models.search.SearchQueryExpression filter) { + public SearchSortingBuilder filter(@Nullable final com.commercetools.api.models.search.SearchQuery filter) { this.filter = filter; return this; } @@ -187,7 +186,7 @@ public com.commercetools.api.models.search.SearchFieldType getFieldType() { */ @Nullable - public com.commercetools.api.models.search.SearchQueryExpression getFilter() { + public com.commercetools.api.models.search.SearchQuery getFilter() { return this.filter; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingImpl.java index 075f9e22f9f..7fcadcfe733 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingImpl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingImpl.java @@ -32,7 +32,7 @@ public class SearchSortingImpl implements SearchSorting, ModelBase { private com.commercetools.api.models.search.SearchFieldType fieldType; - private com.commercetools.api.models.search.SearchQueryExpression filter; + private com.commercetools.api.models.search.SearchQuery filter; /** * create instance with all properties @@ -42,7 +42,7 @@ public class SearchSortingImpl implements SearchSorting, ModelBase { @JsonProperty("order") final com.commercetools.api.models.search.SearchSortOrder order, @JsonProperty("mode") final com.commercetools.api.models.search.SearchSortMode mode, @JsonProperty("fieldType") final com.commercetools.api.models.search.SearchFieldType fieldType, - @JsonProperty("filter") final com.commercetools.api.models.search.SearchQueryExpression filter) { + @JsonProperty("filter") final com.commercetools.api.models.search.SearchQuery filter) { this.field = field; this.language = language; this.order = order; @@ -101,7 +101,7 @@ public com.commercetools.api.models.search.SearchFieldType getFieldType() { *

Allows you to apply a sort filter.

*/ - public com.commercetools.api.models.search.SearchQueryExpression getFilter() { + public com.commercetools.api.models.search.SearchQuery getFilter() { return this.filter; } @@ -125,7 +125,7 @@ public void setFieldType(final com.commercetools.api.models.search.SearchFieldTy this.fieldType = fieldType; } - public void setFilter(final com.commercetools.api.models.search.SearchQueryExpression filter) { + public void setFilter(final com.commercetools.api.models.search.SearchQuery filter) { this.filter = filter; } diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/search/SearchSortingQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/search/SearchSortingQueryBuilderDsl.java index ec4d119c828..ac49f11a946 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/search/SearchSortingQueryBuilderDsl.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/search/SearchSortingQueryBuilderDsl.java @@ -44,12 +44,11 @@ public StringComparisonPredicateBuilder fieldType( } public CombinationQueryPredicate filter( - Function> fn) { + Function> fn) { return new CombinationQueryPredicate<>( ContainerQueryPredicate.of() .parent(ConstantQueryPredicate.of().constant("filter")) - .inner(fn.apply( - com.commercetools.api.predicates.query.search.SearchQueryExpressionQueryBuilderDsl.of())), + .inner(fn.apply(com.commercetools.api.predicates.query.search.SearchQueryQueryBuilderDsl.of())), SearchSortingQueryBuilderDsl::of); } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java index f34da0750fb..f52add4417e 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java @@ -27,8 +27,8 @@ public static Object[][] objectBuilder() { new Object[] { "fieldType", SearchSorting.builder() .fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) }, - new Object[] { "filter", SearchSorting.builder() - .filter(new com.commercetools.api.models.search.SearchQueryExpressionImpl()) } }; + new Object[] { "filter", + SearchSorting.builder().filter(new com.commercetools.api.models.search.SearchQueryImpl()) } }; } @Test @@ -72,8 +72,7 @@ public void fieldType() { @Test public void filter() { SearchSorting value = SearchSorting.of(); - value.setFilter(new com.commercetools.api.models.search.SearchQueryExpressionImpl()); - Assertions.assertThat(value.getFilter()) - .isEqualTo(new com.commercetools.api.models.search.SearchQueryExpressionImpl()); + value.setFilter(new com.commercetools.api.models.search.SearchQueryImpl()); + Assertions.assertThat(value.getFilter()).isEqualTo(new com.commercetools.api.models.search.SearchQueryImpl()); } } diff --git a/references.txt b/references.txt index 86aa369150b..a44c9a77938 100644 --- a/references.txt +++ b/references.txt @@ -419,3 +419,4 @@ b1fc7dfd206272a7717ffe06bf9bdb40fc428a1d f94e106041ca73ddf1379a3450017c042ea2a170 785c84a89e8e2a8c807c80e728e2b160d7304ed1 472c32aba11ea29bb866c99e21b771acfba70891 +195169313ee8edc8449e7a272160ab4e28ad9fec