Skip to content

Commit

Permalink
Merge pull request #376 from commercetools/gen-sdk-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jenschude committed Dec 14, 2022
2 parents 4e0ca76 + d0afefd commit e666aa7
Show file tree
Hide file tree
Showing 244 changed files with 4,475 additions and 10,758 deletions.
29 changes: 22 additions & 7 deletions api-java-mixin.raml
Expand Up @@ -7,10 +7,20 @@ annotationTypes:
allowedTargets: TypeDeclaration

types:
Address:
BaseAddress:
(java-mixin): |
public default AddressDraft toDraft() {
if (this instanceof AddressDraft) {
return (AddressDraft) this;
}
return toDraftBuilder().build();
}
public default AddressDraftBuilder toDraftBuilder() {
return AddressDraft.builder()
if (this instanceof AddressDraft) {
return AddressDraft.builder((AddressDraft)this);
}
AddressDraftBuilder builder = AddressDraft.builder()
.key(this.getKey())
.country(this.getCountry())
.title(this.getTitle())
Expand All @@ -35,15 +45,20 @@ types:
.fax(this.getFax())
.additionalAddressInfo(this.getAdditionalAddressInfo())
.externalId(this.getExternalId());
}
if (this instanceof Address) {
builder.custom(Optional.ofNullable(((Address)this).getCustom()).map(com.commercetools.api.models.type.CustomFields::toDraft).orElse(null));
}
public default AddressDraft toDraft() {
return toDraftBuilder().build();
return builder;
}
public default boolean equalsIgnoreId(final Address address) {
return address != null && Address.builder(address).id(null).buildUnchecked().equals(Address.builder(this).id(null).buildUnchecked());
public default boolean equalsIgnoreId(final BaseAddress address) {
return address != null && address.toDraftBuilder()
.id(null)
.buildUnchecked()
.equals(this.toDraftBuilder().id(null).buildUnchecked());
}
Address:
properties:
id:
required: false
Expand Down
104 changes: 11 additions & 93 deletions changes.md

Large diffs are not rendered by default.

Expand Up @@ -33,4 +33,19 @@ public ByProjectKeyApiClientsPost post(
public ByProjectKeyApiClientsByIDRequestBuilder withId(String ID) {
return new ByProjectKeyApiClientsByIDRequestBuilder(apiHttpClient, projectKey, ID);
}

public ByProjectKeyApiClientsByIDDelete delete(
com.commercetools.api.models.Identifiable<com.commercetools.api.models.api_client.ApiClient> apiClient) {
return withId(apiClient.getId()).delete();
}

public ByProjectKeyApiClientsPost create(com.commercetools.api.models.api_client.ApiClientDraft apiClientDraft) {
return post(apiClientDraft);
}

public ByProjectKeyApiClientsPost create(
UnaryOperator<com.commercetools.api.models.api_client.ApiClientDraftBuilder> op) {
return post(op.apply(com.commercetools.api.models.api_client.ApiClientDraftBuilder.of()).build());
}

}
Expand Up @@ -38,4 +38,48 @@ public ByProjectKeyAttributeGroupsKeyByKeyRequestBuilder withKey(String key) {
public ByProjectKeyAttributeGroupsByIDRequestBuilder withId(String ID) {
return new ByProjectKeyAttributeGroupsByIDRequestBuilder(apiHttpClient, projectKey, ID);
}

public ByProjectKeyAttributeGroupsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.attribute_group.AttributeGroup> attributeGroup,
java.util.List<com.commercetools.api.models.attribute_group.AttributeGroupUpdateAction> actions) {
return withId(attributeGroup.getId())
.post(builder -> com.commercetools.api.models.attribute_group.AttributeGroupUpdate.builder()
.version(attributeGroup.getVersion())
.actions(actions));
}

public ByProjectKeyAttributeGroupsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.attribute_group.AttributeGroup> attributeGroup,
UnaryOperator<UpdateActionBuilder<com.commercetools.api.models.attribute_group.AttributeGroupUpdateAction, com.commercetools.api.models.attribute_group.AttributeGroupUpdateActionBuilder>> op) {
return withId(attributeGroup.getId()).post(
builder -> com.commercetools.api.models.attribute_group.AttributeGroupUpdate.builder()
.version(attributeGroup.getVersion())
.actions(op.apply(UpdateActionBuilder.of(
com.commercetools.api.models.attribute_group.AttributeGroupUpdateActionBuilder::of)).actions));
}

public WithUpdateActionBuilder<com.commercetools.api.models.attribute_group.AttributeGroupUpdateAction, com.commercetools.api.models.attribute_group.AttributeGroupUpdateActionBuilder, ByProjectKeyAttributeGroupsByIDPost> update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.attribute_group.AttributeGroup> attributeGroup) {
return builder -> withId(attributeGroup.getId()).post(
b -> com.commercetools.api.models.attribute_group.AttributeGroupUpdate.builder()
.version(attributeGroup.getVersion())
.actions(builder.apply(UpdateActionBuilder.of(
com.commercetools.api.models.attribute_group.AttributeGroupUpdateActionBuilder::of)).actions));
}

public ByProjectKeyAttributeGroupsByIDDelete delete(
com.commercetools.api.models.Versioned<com.commercetools.api.models.attribute_group.AttributeGroup> attributeGroup) {
return withId(attributeGroup.getId()).delete().withVersion(attributeGroup.getVersion());
}

public ByProjectKeyAttributeGroupsPost create(
com.commercetools.api.models.attribute_group.AttributeGroupDraft attributeGroupDraft) {
return post(attributeGroupDraft);
}

public ByProjectKeyAttributeGroupsPost create(
UnaryOperator<com.commercetools.api.models.attribute_group.AttributeGroupDraftBuilder> op) {
return post(op.apply(com.commercetools.api.models.attribute_group.AttributeGroupDraftBuilder.of()).build());
}

}
Expand Up @@ -39,4 +39,5 @@ public ByProjectKeyBusinessUnitsKeyByKeyRequestBuilder withKey(String key) {
public ByProjectKeyBusinessUnitsByIDRequestBuilder withId(String ID) {
return new ByProjectKeyBusinessUnitsByIDRequestBuilder(apiHttpClient, projectKey, ID);
}

}
Expand Up @@ -38,4 +38,48 @@ public ByProjectKeyCartDiscountsKeyByKeyRequestBuilder withKey(String key) {
public ByProjectKeyCartDiscountsByIDRequestBuilder withId(String ID) {
return new ByProjectKeyCartDiscountsByIDRequestBuilder(apiHttpClient, projectKey, ID);
}

public ByProjectKeyCartDiscountsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart_discount.CartDiscount> cartDiscount,
java.util.List<com.commercetools.api.models.cart_discount.CartDiscountUpdateAction> actions) {
return withId(cartDiscount.getId())
.post(builder -> com.commercetools.api.models.cart_discount.CartDiscountUpdate.builder()
.version(cartDiscount.getVersion())
.actions(actions));
}

public ByProjectKeyCartDiscountsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart_discount.CartDiscount> cartDiscount,
UnaryOperator<UpdateActionBuilder<com.commercetools.api.models.cart_discount.CartDiscountUpdateAction, com.commercetools.api.models.cart_discount.CartDiscountUpdateActionBuilder>> op) {
return withId(cartDiscount.getId())
.post(builder -> com.commercetools.api.models.cart_discount.CartDiscountUpdate.builder()
.version(cartDiscount.getVersion())
.actions(op.apply(UpdateActionBuilder.of(
com.commercetools.api.models.cart_discount.CartDiscountUpdateActionBuilder::of)).actions));
}

public WithUpdateActionBuilder<com.commercetools.api.models.cart_discount.CartDiscountUpdateAction, com.commercetools.api.models.cart_discount.CartDiscountUpdateActionBuilder, ByProjectKeyCartDiscountsByIDPost> update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart_discount.CartDiscount> cartDiscount) {
return builder -> withId(cartDiscount.getId())
.post(b -> com.commercetools.api.models.cart_discount.CartDiscountUpdate.builder()
.version(cartDiscount.getVersion())
.actions(builder.apply(UpdateActionBuilder.of(
com.commercetools.api.models.cart_discount.CartDiscountUpdateActionBuilder::of)).actions));
}

public ByProjectKeyCartDiscountsByIDDelete delete(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart_discount.CartDiscount> cartDiscount) {
return withId(cartDiscount.getId()).delete().withVersion(cartDiscount.getVersion());
}

public ByProjectKeyCartDiscountsPost create(
com.commercetools.api.models.cart_discount.CartDiscountDraft cartDiscountDraft) {
return post(cartDiscountDraft);
}

public ByProjectKeyCartDiscountsPost create(
UnaryOperator<com.commercetools.api.models.cart_discount.CartDiscountDraftBuilder> op) {
return post(op.apply(com.commercetools.api.models.cart_discount.CartDiscountDraftBuilder.of()).build());
}

}
Expand Up @@ -44,4 +44,43 @@ public ByProjectKeyCartsKeyByKeyRequestBuilder withKey(String key) {
public ByProjectKeyCartsByIDRequestBuilder withId(String ID) {
return new ByProjectKeyCartsByIDRequestBuilder(apiHttpClient, projectKey, ID);
}

public ByProjectKeyCartsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart.Cart> cart,
java.util.List<com.commercetools.api.models.cart.CartUpdateAction> actions) {
return withId(cart.getId()).post(builder -> com.commercetools.api.models.cart.CartUpdate.builder()
.version(cart.getVersion())
.actions(actions));
}

public ByProjectKeyCartsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart.Cart> cart,
UnaryOperator<UpdateActionBuilder<com.commercetools.api.models.cart.CartUpdateAction, com.commercetools.api.models.cart.CartUpdateActionBuilder>> op) {
return withId(cart.getId()).post(builder -> com.commercetools.api.models.cart.CartUpdate.builder()
.version(cart.getVersion())
.actions(op.apply(
UpdateActionBuilder.of(com.commercetools.api.models.cart.CartUpdateActionBuilder::of)).actions));
}

public WithUpdateActionBuilder<com.commercetools.api.models.cart.CartUpdateAction, com.commercetools.api.models.cart.CartUpdateActionBuilder, ByProjectKeyCartsByIDPost> update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart.Cart> cart) {
return builder -> withId(cart.getId()).post(b -> com.commercetools.api.models.cart.CartUpdate.builder()
.version(cart.getVersion())
.actions(builder.apply(
UpdateActionBuilder.of(com.commercetools.api.models.cart.CartUpdateActionBuilder::of)).actions));
}

public ByProjectKeyCartsByIDDelete delete(
com.commercetools.api.models.Versioned<com.commercetools.api.models.cart.Cart> cart) {
return withId(cart.getId()).delete().withVersion(cart.getVersion());
}

public ByProjectKeyCartsPost create(com.commercetools.api.models.cart.CartDraft cartDraft) {
return post(cartDraft);
}

public ByProjectKeyCartsPost create(UnaryOperator<com.commercetools.api.models.cart.CartDraftBuilder> op) {
return post(op.apply(com.commercetools.api.models.cart.CartDraftBuilder.of()).build());
}

}
Expand Up @@ -37,4 +37,45 @@ public ByProjectKeyCategoriesKeyByKeyRequestBuilder withKey(String key) {
public ByProjectKeyCategoriesByIDRequestBuilder withId(String ID) {
return new ByProjectKeyCategoriesByIDRequestBuilder(apiHttpClient, projectKey, ID);
}

public ByProjectKeyCategoriesByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.category.Category> category,
java.util.List<com.commercetools.api.models.category.CategoryUpdateAction> actions) {
return withId(category.getId()).post(builder -> com.commercetools.api.models.category.CategoryUpdate.builder()
.version(category.getVersion())
.actions(actions));
}

public ByProjectKeyCategoriesByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.category.Category> category,
UnaryOperator<UpdateActionBuilder<com.commercetools.api.models.category.CategoryUpdateAction, com.commercetools.api.models.category.CategoryUpdateActionBuilder>> op) {
return withId(category.getId()).post(builder -> com.commercetools.api.models.category.CategoryUpdate.builder()
.version(category.getVersion())
.actions(op.apply(UpdateActionBuilder
.of(com.commercetools.api.models.category.CategoryUpdateActionBuilder::of)).actions));
}

public WithUpdateActionBuilder<com.commercetools.api.models.category.CategoryUpdateAction, com.commercetools.api.models.category.CategoryUpdateActionBuilder, ByProjectKeyCategoriesByIDPost> update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.category.Category> category) {
return builder -> withId(category.getId())
.post(b -> com.commercetools.api.models.category.CategoryUpdate.builder()
.version(category.getVersion())
.actions(builder.apply(UpdateActionBuilder
.of(com.commercetools.api.models.category.CategoryUpdateActionBuilder::of)).actions));
}

public ByProjectKeyCategoriesByIDDelete delete(
com.commercetools.api.models.Versioned<com.commercetools.api.models.category.Category> category) {
return withId(category.getId()).delete().withVersion(category.getVersion());
}

public ByProjectKeyCategoriesPost create(com.commercetools.api.models.category.CategoryDraft categoryDraft) {
return post(categoryDraft);
}

public ByProjectKeyCategoriesPost create(
UnaryOperator<com.commercetools.api.models.category.CategoryDraftBuilder> op) {
return post(op.apply(com.commercetools.api.models.category.CategoryDraftBuilder.of()).build());
}

}
Expand Up @@ -32,4 +32,43 @@ public ByProjectKeyChannelsPost post(UnaryOperator<com.commercetools.api.models.
public ByProjectKeyChannelsByIDRequestBuilder withId(String ID) {
return new ByProjectKeyChannelsByIDRequestBuilder(apiHttpClient, projectKey, ID);
}

public ByProjectKeyChannelsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.channel.Channel> channel,
java.util.List<com.commercetools.api.models.channel.ChannelUpdateAction> actions) {
return withId(channel.getId()).post(builder -> com.commercetools.api.models.channel.ChannelUpdate.builder()
.version(channel.getVersion())
.actions(actions));
}

public ByProjectKeyChannelsByIDPost update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.channel.Channel> channel,
UnaryOperator<UpdateActionBuilder<com.commercetools.api.models.channel.ChannelUpdateAction, com.commercetools.api.models.channel.ChannelUpdateActionBuilder>> op) {
return withId(channel.getId()).post(builder -> com.commercetools.api.models.channel.ChannelUpdate.builder()
.version(channel.getVersion())
.actions(op.apply(UpdateActionBuilder
.of(com.commercetools.api.models.channel.ChannelUpdateActionBuilder::of)).actions));
}

public WithUpdateActionBuilder<com.commercetools.api.models.channel.ChannelUpdateAction, com.commercetools.api.models.channel.ChannelUpdateActionBuilder, ByProjectKeyChannelsByIDPost> update(
com.commercetools.api.models.Versioned<com.commercetools.api.models.channel.Channel> channel) {
return builder -> withId(channel.getId()).post(b -> com.commercetools.api.models.channel.ChannelUpdate.builder()
.version(channel.getVersion())
.actions(builder.apply(UpdateActionBuilder
.of(com.commercetools.api.models.channel.ChannelUpdateActionBuilder::of)).actions));
}

public ByProjectKeyChannelsByIDDelete delete(
com.commercetools.api.models.Versioned<com.commercetools.api.models.channel.Channel> channel) {
return withId(channel.getId()).delete().withVersion(channel.getVersion());
}

public ByProjectKeyChannelsPost create(com.commercetools.api.models.channel.ChannelDraft channelDraft) {
return post(channelDraft);
}

public ByProjectKeyChannelsPost create(UnaryOperator<com.commercetools.api.models.channel.ChannelDraftBuilder> op) {
return post(op.apply(com.commercetools.api.models.channel.ChannelDraftBuilder.of()).build());
}

}
Expand Up @@ -38,4 +38,5 @@ public ByProjectKeyCustomObjectsByContainerByKeyRequestBuilder withContainerAndK
public ByProjectKeyCustomObjectsByContainerRequestBuilder withContainer(String container) {
return new ByProjectKeyCustomObjectsByContainerRequestBuilder(apiHttpClient, projectKey, container);
}

}

0 comments on commit e666aa7

Please sign in to comment.