Skip to content

Commit 7492856

Browse files
authored
Merge branch 'main' into DEVX-813-product-search-stats-facet
2 parents 03f2565 + b9f5565 commit 7492856

3,369 files changed

Lines changed: 8626 additions & 7576 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api-java-mixin.raml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,11 @@ types:
533533
}
534534
ProductSetAttributeAction:
535535
(java-mixin): |
536-
public static ProductSetAttributeAction ofVariantId(final Long variantId, final String name, final com.fasterxml.jackson.databind.JsonNode value, final Boolean staged) {
536+
public static ProductSetAttributeAction ofVariantId(final Long variantId, final String name, final tools.jackson.databind.JsonNode value, final Boolean staged) {
537537
return ProductSetAttributeActionBuilder.of().variantId(variantId).name(name).value(value).staged(staged).build();
538538
}
539539
540-
public static ProductSetAttributeAction ofSku(final String sku, final String name, final com.fasterxml.jackson.databind.JsonNode value, final Boolean staged) {
540+
public static ProductSetAttributeAction ofSku(final String sku, final String name, final tools.jackson.databind.JsonNode value, final Boolean staged) {
541541
return ProductSetAttributeActionBuilder.of().sku(sku).name(name).value(value).staged(staged).build();
542542
}
543543

changes.md

Lines changed: 10 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,27 @@
11
**Api changes**
22

33
<details>
4-
<summary>Added Enum(s)</summary>
4+
<summary>Added QueryParameter(s)</summary>
55

6-
- added enum `ReserveOnCart` to type `InventoryMode`
7-
- added enum `reservation` to type `ReferenceTypeId`
8-
- added enum `reservation` to type `ResourceTypeId`
9-
</details>
10-
11-
12-
<details>
13-
<summary>Added Type(s)</summary>
14-
15-
- added type `ReservationReference`
16-
- added type `CartSetReservationExpirationInMinutesAction`
17-
- added type `NonStandardCurrency`
18-
- added type `CircularDependencyError`
19-
- added type `ExtensionChainTooDeepError`
20-
- added type `ExtensionChainTooWideError`
21-
- added type `ExtensionDependencyExistsError`
22-
- added type `LineItemQuantityAboveLimitError`
23-
- added type `LineItemQuantityBelowLimitError`
24-
- added type `MissingDependencyError`
25-
- added type `GraphQLCircularDependencyError`
26-
- added type `GraphQLExtensionChainTooDeepError`
27-
- added type `GraphQLExtensionChainTooWideError`
28-
- added type `GraphQLExtensionDependencyExistsError`
29-
- added type `GraphQLLineItemQuantityAboveLimitError`
30-
- added type `GraphQLLineItemQuantityBelowLimitError`
31-
- added type `GraphQLMissingDependencyError`
32-
- added type `ExtensionAdditionalContext`
33-
- added type `ExtensionAdditionalContextDraft`
34-
- added type `ExtensionReference`
35-
- added type `ExtensionResourceIdentifier`
36-
- added type `ExtensionSetAdditionalContextAction`
37-
- added type `ExtensionSetDependenciesAction`
38-
- added type `ExtensionSetExpansionPathsAction`
39-
- added type `InventoryEntryStockLevels`
40-
- added type `InventoryEntrySetReorderPointAction`
41-
- added type `InventoryEntrySetReservationExpirationInMinutesAction`
42-
- added type `InventoryEntrySetSafetyStockAction`
43-
- added type `InventoryEntryOutOfStockMessage`
44-
- added type `InventoryEntryReorderPointMessage`
45-
- added type `InventoryEntryReservationExpirationInMinutesSetMessage`
46-
- added type `InventoryEntrySafetyStockMessage`
47-
- added type `InventoryEntryOutOfStockMessagePayload`
48-
- added type `InventoryEntryReorderPointMessagePayload`
49-
- added type `InventoryEntryReservationExpirationInMinutesSetMessagePayload`
50-
- added type `InventoryEntrySafetyStockMessagePayload`
51-
- added type `InventoryConfiguration`
52-
- added type `ProjectSetReleaseExpiredReservationsAction`
53-
- added type `ProjectSetReservationExpirationInMinutesAction`
54-
- added type `Reservation`
55-
- added type `ReservationState`
56-
- added type `CannotChangeReservationExpiryWarning`
57-
- added type `CannotCreateReservationWarning`
58-
- added type `CannotUpdateReservationWarning`
59-
</details>
60-
61-
62-
<details>
63-
<summary>Added Property(s)</summary>
64-
65-
- added property `warnings` to type `Cart`
66-
- added property `reservation` to type `LineItem`
67-
- added property `dependencies` to type `Extension`
68-
- added property `expansionPaths` to type `Extension`
69-
- added property `additionalContext` to type `Extension`
70-
- added property `dependencies` to type `ExtensionDraft`
71-
- added property `expansionPaths` to type `ExtensionDraft`
72-
- added property `additionalContext` to type `ExtensionDraft`
73-
- added property `oldResource` to type `ExtensionInput`
74-
- added property `reservationExpirationInMinutes` to type `InventoryEntry`
75-
- added property `stockLevels` to type `InventoryEntry`
76-
- added property `reservationExpirationInMinutes` to type `InventoryEntryDraft`
77-
- added property `stockLevels` to type `InventoryEntryDraft`
78-
- added property `inventory` to type `Project`
79-
</details>
80-
81-
**Import changes**
82-
83-
<details>
84-
<summary>Added Resource(s)</summary>
85-
86-
- added resource `/{projectKey}/product-tailorings`
87-
- added resource `/{projectKey}/product-tailorings/import-containers`
88-
- added resource `/{projectKey}/product-tailorings/import-containers/{importContainerKey}`
89-
</details>
90-
91-
92-
<details>
93-
<summary>Added Enum(s)</summary>
94-
95-
- added enum `product-tailoring` to type `ImportResourceType`
96-
</details>
97-
98-
99-
<details>
100-
<summary>Added Type(s)</summary>
101-
102-
- added type `ProductTailoringImportRequest`
103-
- added type `ProductVariantTailoringImport`
104-
- added type `ProductTailoringImport`
105-
</details>
106-
107-
108-
<details>
109-
<summary>Added Method(s)</summary>
110-
111-
- added method `apiRoot.withProjectKeyValue().productTailorings().importContainers().withImportContainerKeyValue().post()`
112-
</details>
113-
114-
115-
<details>
116-
<summary>Added Property(s)</summary>
117-
118-
- added property `reservationExpirationInMinutes` to type `InventoryImport`
119-
- added property `active` to type `StandalonePriceImport`
120-
</details>
121-
122-
**History changes**
123-
124-
<details>
125-
<summary>Added Enum(s)</summary>
126-
127-
- added enum `setReservationExpirationInMinutes` to type `UpdateType`
128-
</details>
129-
130-
131-
<details>
132-
<summary>Added Type(s)</summary>
133-
134-
- added type `SetTransactionInterfaceIdChange`
135-
</details>
136-
137-
138-
<details>
139-
<summary>Added Property(s)</summary>
140-
141-
- added property `catalogData` to type `ChangeLocalizedNameChange`
142-
- added property `catalogData` to type `SetLocalizedDescriptionChange`
6+
- added query parameter `dataErasure` to method `delete /{projectKey}/business-units/key={key}`
7+
- added query parameter `dataErasure` to method `delete /{projectKey}/business-units/{ID}`
8+
- added query parameter `dataErasure` to method `delete /{projectKey}/in-store/key={storeKey}/business-units/key={key}`
9+
- added query parameter `dataErasure` to method `delete /{projectKey}/in-store/key={storeKey}/business-units/{ID}`
14310
</details>
14411

14512
**Checkout changes**
14613

14714
<details>
148-
<summary>Added Enum(s)</summary>
15+
<summary>Changed MethodResponseBody(s)</summary>
14916

150-
- added enum `eu-central-1.aws` to type `Region`
151-
- added enum `us-east-2.aws` to type `Region`
17+
- :warning: changed response body for `200: application/json` of method `post /{projectKey}/payment-intents/{paymentId}` from type `any` to `PaymentIntentResponse`
15218
</details>
15319

15420

15521
<details>
156-
<summary>Removed Type(s)</summary>
22+
<summary>Added Type(s)</summary>
15723

158-
- :warning: removed type `SetConnectorDeploymentUpdateAction`
24+
- added type `PaymentIntentOutcome`
25+
- added type `PaymentIntentResponse`
15926
</details>
16027

commercetools/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ generate_sdk: generate_sdk_main generate_sdk_test
55
generate_sdk_with_predicates: generate_sdk_main generate_sdk_predicates generate_sdk_test
66

77
generate_sdk_main:
8-
rmf-codegen generate -o "commercetools-sdk-java-$(LIB_NAME)/src/main/java-generated" -t JAVA_CLIENT -b "com/commercetools/$(LIB_NAME)" --mappingFile "commercetools-sdk-java-$(LIB_NAME)/typesmap.properties" $(GEN_RAML_FILE)
8+
rmf-codegen generate -o "commercetools-sdk-java-$(LIB_NAME)/src/main/java-generated" -t JAVA_CLIENT -b "com/commercetools/$(LIB_NAME)" --mappingFile "commercetools-sdk-java-$(LIB_NAME)/typesmap.properties" --jackson-v3 $(GEN_RAML_FILE)
99

1010
generate_sdk_predicates:
11-
rmf-codegen generate -o "commercetools-sdk-java-$(LIB_NAME)/src/main/java-predicates-generated" -t JAVA_QUERY_PREDICATES -b "com/commercetools/$(LIB_NAME)" --mappingFile "commercetools-sdk-java-$(LIB_NAME)/predicate-typesmap.properties" $(GEN_RAML_FILE)
11+
rmf-codegen generate -o "commercetools-sdk-java-$(LIB_NAME)/src/main/java-predicates-generated" -t JAVA_QUERY_PREDICATES -b "com/commercetools/$(LIB_NAME)" --mappingFile "commercetools-sdk-java-$(LIB_NAME)/predicate-typesmap.properties" --jackson-v3 $(GEN_RAML_FILE)
1212

1313
generate_sdk_test:
14-
rmf-codegen generate -o "commercetools-sdk-java-$(LIB_NAME)/src/test/java-generated" -t JAVA_TEST -b "com/commercetools/$(LIB_NAME)" --mappingFile "commercetools-sdk-java-$(LIB_NAME)/typesmap.properties" $(GEN_RAML_FILE)
14+
rmf-codegen generate -o "commercetools-sdk-java-$(LIB_NAME)/src/test/java-generated" -t JAVA_TEST -b "com/commercetools/$(LIB_NAME)" --mappingFile "commercetools-sdk-java-$(LIB_NAME)/typesmap.properties" --jackson-v3 $(GEN_RAML_FILE)

0 commit comments

Comments
 (0)