Skip to content

Commit 8d59c59

Browse files
kafiskafis
authored
Merge pull request #1227 from commercetools/SUPPORT-34507/null-pointer-in-product-attributes
SUPPORT-34507: update SDK version for latest product-draft model
2 parents 5d3cf1d + e1eb967 commit 8d59c59

File tree

6 files changed

+47
-30
lines changed

6 files changed

+47
-30
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
ext{
12-
commercetoolsJavaSdkV2Version = '18.0.0'
12+
commercetoolsJavaSdkV2Version = '19.3.0'
1313
mockitoJunitJupiterVersion = '5.19.0'
1414
jupiterApiVersion = '5.13.4'
1515
jupiterPlatformVersion = '1.13.4'

‎src/test/java/com/commercetools/sync/products/utils/ProductSyncUtilsTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@
5858
import com.commercetools.api.models.product.ProductVariantDraftBuilder;
5959
import com.commercetools.api.models.product.SearchKeywordBuilder;
6060
import com.commercetools.api.models.product.SearchKeywordsBuilder;
61-
import com.commercetools.api.models.product_type.AttributeConstraintEnum;
62-
import com.commercetools.api.models.product_type.AttributeDefinitionBuilder;
63-
import com.commercetools.api.models.product_type.AttributeTypeBuilder;
64-
import com.commercetools.api.models.product_type.ProductTypeResourceIdentifierBuilder;
65-
import com.commercetools.api.models.product_type.TextInputHint;
61+
import com.commercetools.api.models.product_type.*;
6662
import com.commercetools.sync.commons.utils.TestUtils;
6763
import com.commercetools.sync.products.AttributeMetaData;
6864
import com.commercetools.sync.products.ProductSyncMockUtils;
@@ -463,6 +459,7 @@ void buildActions_FromDraftsWithSameForAllAttribute_ShouldBuildUpdateActions() {
463459
.name("brandName")
464460
.attributeConstraint(AttributeConstraintEnum.SAME_FOR_ALL)
465461
.type(AttributeTypeBuilder::textBuilder)
462+
.level(AttributeLevelEnum.VARIANT)
466463
.label(ofEnglish("brandName"))
467464
.isRequired(false)
468465
.inputHint(TextInputHint.SINGLE_LINE)
@@ -539,6 +536,7 @@ void buildActions_FromDraftsWithDifferentAttributes_ShouldBuildUpdateActions() {
539536
.name("brandName")
540537
.attributeConstraint(AttributeConstraintEnum.NONE)
541538
.type(AttributeTypeBuilder::textBuilder)
539+
.level(AttributeLevelEnum.VARIANT)
542540
.label(ofEnglish("brandName"))
543541
.isRequired(false)
544542
.inputHint(TextInputHint.SINGLE_LINE)
@@ -550,6 +548,7 @@ void buildActions_FromDraftsWithDifferentAttributes_ShouldBuildUpdateActions() {
550548
.name("orderLimit")
551549
.attributeConstraint(AttributeConstraintEnum.NONE)
552550
.type(AttributeTypeBuilder::textBuilder)
551+
.level(AttributeLevelEnum.VARIANT)
553552
.label(ofEnglish("orderLimit"))
554553
.isRequired(false)
555554
.inputHint(TextInputHint.SINGLE_LINE)
@@ -561,6 +560,7 @@ void buildActions_FromDraftsWithDifferentAttributes_ShouldBuildUpdateActions() {
561560
.name("priceInfo")
562561
.attributeConstraint(AttributeConstraintEnum.NONE)
563562
.type(AttributeTypeBuilder::textBuilder)
563+
.level(AttributeLevelEnum.VARIANT)
564564
.label(ofEnglish("priceInfo"))
565565
.isRequired(false)
566566
.inputHint(TextInputHint.SINGLE_LINE)
@@ -572,6 +572,7 @@ void buildActions_FromDraftsWithDifferentAttributes_ShouldBuildUpdateActions() {
572572
.name("size")
573573
.attributeConstraint(AttributeConstraintEnum.NONE)
574574
.type(AttributeTypeBuilder::textBuilder)
575+
.level(AttributeLevelEnum.VARIANT)
575576
.label(ofEnglish("size"))
576577
.isRequired(false)
577578
.inputHint(TextInputHint.SINGLE_LINE)

‎src/test/java/com/commercetools/sync/products/utils/ProductUpdateActionUtilsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@
3131
import com.commercetools.api.models.product.ProductVariant;
3232
import com.commercetools.api.models.product.ProductVariantDraft;
3333
import com.commercetools.api.models.product.ProductVariantDraftBuilder;
34-
import com.commercetools.api.models.product_type.AttributeConstraintEnum;
35-
import com.commercetools.api.models.product_type.AttributeDefinitionBuilder;
36-
import com.commercetools.api.models.product_type.AttributeTypeBuilder;
37-
import com.commercetools.api.models.product_type.ProductTypeResourceIdentifier;
38-
import com.commercetools.api.models.product_type.TextInputHint;
34+
import com.commercetools.api.models.product_type.*;
3935
import com.commercetools.sync.products.AttributeMetaData;
4036
import com.commercetools.sync.products.ProductSyncMockUtils;
4137
import com.commercetools.sync.products.ProductSyncOptions;
@@ -91,6 +87,7 @@ static void beforeAll() {
9187
.label(LocalizedString.ofEnglish("priceInfo"))
9288
.attributeConstraint(AttributeConstraintEnum.NONE)
9389
.type(AttributeTypeBuilder::textBuilder)
90+
.level(AttributeLevelEnum.VARIANT)
9491
.isRequired(false)
9592
.isSearchable(true)
9693
.inputHint(TextInputHint.SINGLE_LINE)
@@ -103,6 +100,7 @@ static void beforeAll() {
103100
.label(LocalizedString.ofEnglish("size"))
104101
.attributeConstraint(AttributeConstraintEnum.NONE)
105102
.type(AttributeTypeBuilder::textBuilder)
103+
.level(AttributeLevelEnum.VARIANT)
106104
.isRequired(false)
107105
.isSearchable(true)
108106
.inputHint(TextInputHint.SINGLE_LINE)
@@ -245,6 +243,7 @@ void buildVariantsUpdateActions_updateVariantsWithSameForAll() {
245243
.label(LocalizedString.ofEnglish("priceInfo"))
246244
.attributeConstraint(AttributeConstraintEnum.SAME_FOR_ALL)
247245
.type(AttributeTypeBuilder::textBuilder)
246+
.level(AttributeLevelEnum.VARIANT)
248247
.isRequired(false)
249248
.isSearchable(true)
250249
.inputHint(TextInputHint.SINGLE_LINE)
@@ -256,6 +255,7 @@ void buildVariantsUpdateActions_updateVariantsWithSameForAll() {
256255
.label(LocalizedString.ofEnglish("size"))
257256
.attributeConstraint(AttributeConstraintEnum.NONE)
258257
.type(AttributeTypeBuilder::textBuilder)
258+
.level(AttributeLevelEnum.VARIANT)
259259
.isRequired(false)
260260
.isSearchable(true)
261261
.inputHint(TextInputHint.SINGLE_LINE)

‎src/test/java/com/commercetools/sync/products/utils/productvariantupdateactionutils/attributes/BuildProductVariantAttributeUpdateActionsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
import com.commercetools.api.models.product.ProductSetAttributeActionBuilder;
1010
import com.commercetools.api.models.product.ProductSetAttributeInAllVariantsActionBuilder;
1111
import com.commercetools.api.models.product.ProductUpdateAction;
12-
import com.commercetools.api.models.product_type.AttributeConstraintEnum;
13-
import com.commercetools.api.models.product_type.AttributeDefinition;
14-
import com.commercetools.api.models.product_type.AttributeDefinitionBuilder;
15-
import com.commercetools.api.models.product_type.AttributeTextTypeBuilder;
16-
import com.commercetools.api.models.product_type.TextInputHint;
12+
import com.commercetools.api.models.product_type.*;
1713
import com.commercetools.sync.commons.exceptions.BuildUpdateActionException;
1814
import com.commercetools.sync.products.AttributeMetaData;
1915
import com.commercetools.sync.products.utils.ProductVariantAttributeUpdateActionUtils;
@@ -39,6 +35,7 @@ void withNullOldAndNonNullNew_ShouldBuildSetAction() throws BuildUpdateActionExc
3935
.name(newAttribute.getName())
4036
.label(ofEnglish("foo"))
4137
.type(AttributeTextTypeBuilder.of().build())
38+
.level(AttributeLevelEnum.VARIANT)
4239
.attributeConstraint(AttributeConstraintEnum.NONE)
4340
.inputHint(TextInputHint.SINGLE_LINE)
4441
.isSearchable(true)
@@ -76,6 +73,7 @@ void withNullOldAndNonNullNew_WithSameForAllAttribute_ShouldBuildSetAllAction()
7673
.name(newAttribute.getName())
7774
.label(ofEnglish("foo"))
7875
.type(AttributeTextTypeBuilder.of().build())
76+
.level(AttributeLevelEnum.VARIANT)
7977
.attributeConstraint(AttributeConstraintEnum.SAME_FOR_ALL)
8078
.inputHint(TextInputHint.SINGLE_LINE)
8179
.isSearchable(true)
@@ -136,6 +134,7 @@ void withDifferentValues_ShouldBuildSetAction() throws BuildUpdateActionExceptio
136134
.name(newAttribute.getName())
137135
.label(ofEnglish("foo"))
138136
.type(AttributeTextTypeBuilder.of().build())
137+
.level(AttributeLevelEnum.VARIANT)
139138
.attributeConstraint(AttributeConstraintEnum.NONE)
140139
.inputHint(TextInputHint.SINGLE_LINE)
141140
.isSearchable(true)
@@ -172,6 +171,7 @@ void withSameValues_ShouldNotBuildAction() throws BuildUpdateActionException {
172171
.name(newAttribute.getName())
173172
.label(ofEnglish("foo"))
174173
.type(AttributeTextTypeBuilder.of().build())
174+
.level(AttributeLevelEnum.VARIANT)
175175
.attributeConstraint(AttributeConstraintEnum.SAME_FOR_ALL)
176176
.inputHint(TextInputHint.SINGLE_LINE)
177177
.isSearchable(true)

0 commit comments

Comments
 (0)