Skip to content
Merged
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
7 changes: 7 additions & 0 deletions changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
</details>


<details>
<summary>Changed Property(s)</summary>

- :warning: changed property `filter` of type `SearchSorting` from type `SearchQueryExpression` to `SearchQuery`
</details>


<details>
<summary>Added Property(s)</summary>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public interface SearchSorting {
*/
@Valid
@JsonProperty("filter")
public SearchQueryExpression getFilter();
public SearchQuery getFilter();

/**
* <p>Use any searchable field of the resource as sort criterion, or <code>"score"</code> to sort by relevance score calculated by the API.</p>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class SearchSortingBuilder implements Builder<SearchSorting> {
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;

/**
* <p>Use any searchable field of the resource as sort criterion, or <code>"score"</code> to sort by relevance score calculated by the API.</p>
Expand Down Expand Up @@ -104,8 +104,8 @@ public SearchSortingBuilder fieldType(
*/

public SearchSortingBuilder filter(
Function<com.commercetools.api.models.search.SearchQueryExpressionBuilder, com.commercetools.api.models.search.SearchQueryExpressionBuilder> builder) {
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryExpressionBuilder.of()).build();
Function<com.commercetools.api.models.search.SearchQueryBuilder, com.commercetools.api.models.search.SearchQueryBuilder> builder) {
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryBuilder.of()).build();
return this;
}

Expand All @@ -116,8 +116,8 @@ public SearchSortingBuilder filter(
*/

public SearchSortingBuilder withFilter(
Function<com.commercetools.api.models.search.SearchQueryExpressionBuilder, com.commercetools.api.models.search.SearchQueryExpression> builder) {
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryExpressionBuilder.of());
Function<com.commercetools.api.models.search.SearchQueryBuilder, com.commercetools.api.models.search.SearchQuery> builder) {
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryBuilder.of());
return this;
}

Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -101,7 +101,7 @@ public com.commercetools.api.models.search.SearchFieldType getFieldType() {
* <p>Allows you to apply a sort filter.</p>
*/

public com.commercetools.api.models.search.SearchQueryExpression getFilter() {
public com.commercetools.api.models.search.SearchQuery getFilter() {
return this.filter;
}

Expand All @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@
}

public CombinationQueryPredicate<SearchSortingQueryBuilderDsl> filter(
Function<com.commercetools.api.predicates.query.search.SearchQueryExpressionQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.search.SearchQueryExpressionQueryBuilderDsl>> fn) {
Function<com.commercetools.api.predicates.query.search.SearchQueryQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.search.SearchQueryQueryBuilderDsl>> 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())),

Check warning on line 51 in commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/search/SearchSortingQueryBuilderDsl.java

View check run for this annotation

Codecov / codecov/patch

commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/search/SearchSortingQueryBuilderDsl.java#L51

Added line #L51 was not covered by tests
SearchSortingQueryBuilderDsl::of);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
}
}
1 change: 1 addition & 0 deletions references.txt
Original file line number Diff line number Diff line change
Expand Up @@ -419,3 +419,4 @@ b1fc7dfd206272a7717ffe06bf9bdb40fc428a1d
f94e106041ca73ddf1379a3450017c042ea2a170
785c84a89e8e2a8c807c80e728e2b160d7304ed1
472c32aba11ea29bb866c99e21b771acfba70891
195169313ee8edc8449e7a272160ab4e28ad9fec