Skip to content

Commit e04921d

Browse files
Merge pull request #926 from commercetools/gen-sdk-updates
Update generated SDKs
2 parents 9e585b1 + f4efb83 commit e04921d

File tree

7 files changed

+28
-23
lines changed

7 files changed

+28
-23
lines changed

changes.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
</details>
99

1010

11+
<details>
12+
<summary>Changed Property(s)</summary>
13+
14+
- :warning: changed property `filter` of type `SearchSorting` from type `SearchQueryExpression` to `SearchQuery`
15+
</details>
16+
17+
1118
<details>
1219
<summary>Added Property(s)</summary>
1320

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSorting.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public interface SearchSorting {
7979
*/
8080
@Valid
8181
@JsonProperty("filter")
82-
public SearchQueryExpression getFilter();
82+
public SearchQuery getFilter();
8383

8484
/**
8585
* <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>
@@ -121,7 +121,7 @@ public interface SearchSorting {
121121
* @param filter value to be set
122122
*/
123123

124-
public void setFilter(final SearchQueryExpression filter);
124+
public void setFilter(final SearchQuery filter);
125125

126126
/**
127127
* factory method
@@ -165,7 +165,7 @@ public static SearchSorting deepCopy(@Nullable final SearchSorting template) {
165165
instance.setOrder(template.getOrder());
166166
instance.setMode(template.getMode());
167167
instance.setFieldType(template.getFieldType());
168-
instance.setFilter(com.commercetools.api.models.search.SearchQueryExpression.deepCopy(template.getFilter()));
168+
instance.setFilter(com.commercetools.api.models.search.SearchQuery.deepCopy(template.getFilter()));
169169
return instance;
170170
}
171171

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingBuilder.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class SearchSortingBuilder implements Builder<SearchSorting> {
3939
private com.commercetools.api.models.search.SearchFieldType fieldType;
4040

4141
@Nullable
42-
private com.commercetools.api.models.search.SearchQueryExpression filter;
42+
private com.commercetools.api.models.search.SearchQuery filter;
4343

4444
/**
4545
* <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>
@@ -104,8 +104,8 @@ public SearchSortingBuilder fieldType(
104104
*/
105105

106106
public SearchSortingBuilder filter(
107-
Function<com.commercetools.api.models.search.SearchQueryExpressionBuilder, com.commercetools.api.models.search.SearchQueryExpressionBuilder> builder) {
108-
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryExpressionBuilder.of()).build();
107+
Function<com.commercetools.api.models.search.SearchQueryBuilder, com.commercetools.api.models.search.SearchQueryBuilder> builder) {
108+
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryBuilder.of()).build();
109109
return this;
110110
}
111111

@@ -116,8 +116,8 @@ public SearchSortingBuilder filter(
116116
*/
117117

118118
public SearchSortingBuilder withFilter(
119-
Function<com.commercetools.api.models.search.SearchQueryExpressionBuilder, com.commercetools.api.models.search.SearchQueryExpression> builder) {
120-
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryExpressionBuilder.of());
119+
Function<com.commercetools.api.models.search.SearchQueryBuilder, com.commercetools.api.models.search.SearchQuery> builder) {
120+
this.filter = builder.apply(com.commercetools.api.models.search.SearchQueryBuilder.of());
121121
return this;
122122
}
123123

@@ -127,8 +127,7 @@ public SearchSortingBuilder withFilter(
127127
* @return Builder
128128
*/
129129

130-
public SearchSortingBuilder filter(
131-
@Nullable final com.commercetools.api.models.search.SearchQueryExpression filter) {
130+
public SearchSortingBuilder filter(@Nullable final com.commercetools.api.models.search.SearchQuery filter) {
132131
this.filter = filter;
133132
return this;
134133
}
@@ -187,7 +186,7 @@ public com.commercetools.api.models.search.SearchFieldType getFieldType() {
187186
*/
188187

189188
@Nullable
190-
public com.commercetools.api.models.search.SearchQueryExpression getFilter() {
189+
public com.commercetools.api.models.search.SearchQuery getFilter() {
191190
return this.filter;
192191
}
193192

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/search/SearchSortingImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class SearchSortingImpl implements SearchSorting, ModelBase {
3232

3333
private com.commercetools.api.models.search.SearchFieldType fieldType;
3434

35-
private com.commercetools.api.models.search.SearchQueryExpression filter;
35+
private com.commercetools.api.models.search.SearchQuery filter;
3636

3737
/**
3838
* create instance with all properties
@@ -42,7 +42,7 @@ public class SearchSortingImpl implements SearchSorting, ModelBase {
4242
@JsonProperty("order") final com.commercetools.api.models.search.SearchSortOrder order,
4343
@JsonProperty("mode") final com.commercetools.api.models.search.SearchSortMode mode,
4444
@JsonProperty("fieldType") final com.commercetools.api.models.search.SearchFieldType fieldType,
45-
@JsonProperty("filter") final com.commercetools.api.models.search.SearchQueryExpression filter) {
45+
@JsonProperty("filter") final com.commercetools.api.models.search.SearchQuery filter) {
4646
this.field = field;
4747
this.language = language;
4848
this.order = order;
@@ -101,7 +101,7 @@ public com.commercetools.api.models.search.SearchFieldType getFieldType() {
101101
* <p>Allows you to apply a sort filter.</p>
102102
*/
103103

104-
public com.commercetools.api.models.search.SearchQueryExpression getFilter() {
104+
public com.commercetools.api.models.search.SearchQuery getFilter() {
105105
return this.filter;
106106
}
107107

@@ -125,7 +125,7 @@ public void setFieldType(final com.commercetools.api.models.search.SearchFieldTy
125125
this.fieldType = fieldType;
126126
}
127127

128-
public void setFilter(final com.commercetools.api.models.search.SearchQueryExpression filter) {
128+
public void setFilter(final com.commercetools.api.models.search.SearchQuery filter) {
129129
this.filter = filter;
130130
}
131131

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ public StringComparisonPredicateBuilder<SearchSortingQueryBuilderDsl> fieldType(
4444
}
4545

4646
public CombinationQueryPredicate<SearchSortingQueryBuilderDsl> filter(
47-
Function<com.commercetools.api.predicates.query.search.SearchQueryExpressionQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.search.SearchQueryExpressionQueryBuilderDsl>> fn) {
47+
Function<com.commercetools.api.predicates.query.search.SearchQueryQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.search.SearchQueryQueryBuilderDsl>> fn) {
4848
return new CombinationQueryPredicate<>(
4949
ContainerQueryPredicate.of()
5050
.parent(ConstantQueryPredicate.of().constant("filter"))
51-
.inner(fn.apply(
52-
com.commercetools.api.predicates.query.search.SearchQueryExpressionQueryBuilderDsl.of())),
51+
.inner(fn.apply(com.commercetools.api.predicates.query.search.SearchQueryQueryBuilderDsl.of())),
5352
SearchSortingQueryBuilderDsl::of);
5453
}
5554

commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public static Object[][] objectBuilder() {
2727
new Object[] { "fieldType",
2828
SearchSorting.builder()
2929
.fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) },
30-
new Object[] { "filter", SearchSorting.builder()
31-
.filter(new com.commercetools.api.models.search.SearchQueryExpressionImpl()) } };
30+
new Object[] { "filter",
31+
SearchSorting.builder().filter(new com.commercetools.api.models.search.SearchQueryImpl()) } };
3232
}
3333

3434
@Test
@@ -72,8 +72,7 @@ public void fieldType() {
7272
@Test
7373
public void filter() {
7474
SearchSorting value = SearchSorting.of();
75-
value.setFilter(new com.commercetools.api.models.search.SearchQueryExpressionImpl());
76-
Assertions.assertThat(value.getFilter())
77-
.isEqualTo(new com.commercetools.api.models.search.SearchQueryExpressionImpl());
75+
value.setFilter(new com.commercetools.api.models.search.SearchQueryImpl());
76+
Assertions.assertThat(value.getFilter()).isEqualTo(new com.commercetools.api.models.search.SearchQueryImpl());
7877
}
7978
}

references.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,3 +419,4 @@ b1fc7dfd206272a7717ffe06bf9bdb40fc428a1d
419419
f94e106041ca73ddf1379a3450017c042ea2a170
420420
785c84a89e8e2a8c807c80e728e2b160d7304ed1
421421
472c32aba11ea29bb866c99e21b771acfba70891
422+
195169313ee8edc8449e7a272160ab4e28ad9fec

0 commit comments

Comments
 (0)