Skip to content

Commit 949d6b0

Browse files
jenschudejenschude
committed
fix package split for references
1 parent 89f4217 commit 949d6b0

File tree

9 files changed

+99
-13
lines changed

9 files changed

+99
-13
lines changed

‎commercetools/commercetools-sdk-java-api/build.gradle‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,25 @@ sourceSets.main.java.srcDirs += "src/main/java-generated"
2121
sourceSets.main.java.srcDirs += "src/main/java-predicates-generated"
2222
sourceSets.test.java.srcDirs += "src/test/java-generated"
2323

24-
2524
projectDir.toPath().resolve("src/main/java-generated/com/commercetools/api/models/").eachDir { dir ->
2625
def dirname = dir.toFile().name
27-
def modelTask = tasks.register("models_${dirname}Jar", Jar) {
28-
from sourceSets.main.output
2926

30-
include "**/models/$dirname/**"
31-
archiveBaseName = project.name + "-models-$dirname"
27+
def modelTask
28+
if (dirname != "common") {
29+
modelTask = tasks.register("models_${dirname}Jar", Jar) {
30+
from sourceSets.main.output
31+
32+
include "**/models/$dirname/**"
33+
exclude "**/models/**/*ReferenceBuilder*", "**/models/**/*ResourceIdentifierBuilder*"
34+
archiveBaseName = project.name + "-models-$dirname"
35+
}
36+
} else {
37+
modelTask = tasks.register("models_${dirname}Jar", Jar) {
38+
from sourceSets.main.output
39+
40+
include "**/models/$dirname/**", "**/models/**/*ReferenceBuilder*", "**/models/**/*ResourceIdentifierBuilder*"
41+
archiveBaseName = project.name + "-models-$dirname"
42+
}
3243
}
3344
def modelSourcesTask = tasks.register("sources_${dirname}Jar", Jar) {
3445
archiveClassifier = 'sources'

‎commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/client/ByProjectKeyCustomersRequestBuilderMixin.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
import java.util.function.UnaryOperator;
66

77
import com.commercetools.api.models.Versioned;
8-
import com.commercetools.api.models.customer.*;
8+
import com.commercetools.api.models.customer.Customer;
9+
import com.commercetools.api.models.customer.CustomerDraft;
10+
import com.commercetools.api.models.customer.CustomerDraftBuilder;
11+
import com.commercetools.api.models.customer.CustomerUpdate;
12+
import com.commercetools.api.models.customer.CustomerUpdateAction;
13+
import com.commercetools.api.models.customer.CustomerUpdateActionBuilder;
914

1015
public interface ByProjectKeyCustomersRequestBuilderMixin {
1116
public ByProjectKeyCustomersByIDRequestBuilder withId(String ID);

‎commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/defaultconfig/ApiRootBuilder.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313

1414
import javax.annotation.Nullable;
1515

16-
import com.commercetools.api.client.*;
16+
import com.commercetools.api.client.ApiCorrelationIdProvider;
17+
import com.commercetools.api.client.ApiInternalLoggerFactory;
18+
import com.commercetools.api.client.ApiRoot;
19+
import com.commercetools.api.client.ByProjectKeyRequestBuilder;
20+
import com.commercetools.api.client.ConcurrentModificationMiddleware;
21+
import com.commercetools.api.client.ProjectApiRoot;
1722
import com.commercetools.api.client.error.ApiHttpExceptionFactory;
1823

1924
import io.vrap.rmf.base.client.*;

‎commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeDeserializer.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import com.commercetools.api.models.common.LocalizedString;
1313
import com.commercetools.api.models.common.Reference;
1414
import com.commercetools.api.models.common.TypedMoney;
15-
import com.commercetools.api.models.product.*;
15+
import com.commercetools.api.models.product.Attribute;
16+
import com.commercetools.api.models.product.AttributeBuilder;
17+
import com.commercetools.api.models.product.AttributeImpl;
1618
import com.commercetools.api.models.product_type.AttributeLocalizedEnumValue;
1719
import com.commercetools.api.models.product_type.AttributePlainEnumValue;
1820
import com.fasterxml.jackson.core.JsonParser;

‎commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldDeserializer.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import com.commercetools.api.models.common.LocalizedString;
1313
import com.commercetools.api.models.common.Reference;
1414
import com.commercetools.api.models.common.TypedMoney;
15-
import com.commercetools.api.models.type.*;
15+
import com.commercetools.api.models.type.CustomFieldEnumValue;
16+
import com.commercetools.api.models.type.CustomFieldLocalizedEnumValue;
17+
import com.commercetools.api.models.type.FieldContainerBuilder;
18+
import com.commercetools.api.models.type.FieldContainerImpl;
1619
import com.fasterxml.jackson.core.JsonParser;
1720
import com.fasterxml.jackson.core.type.TypeReference;
1821
import com.fasterxml.jackson.databind.DeserializationContext;

‎commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/custom_object/GenericCustomObject.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
import javax.annotation.Nullable;
88

99
import com.commercetools.api.models.Referencable;
10-
import com.commercetools.api.models.common.*;
10+
import com.commercetools.api.models.common.BaseResource;
11+
import com.commercetools.api.models.common.CreatedBy;
12+
import com.commercetools.api.models.common.LastModifiedBy;
13+
import com.commercetools.api.models.common.Reference;
1114
import com.fasterxml.jackson.annotation.JsonProperty;
1215
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1316

‎commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/order/OrderLike.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,24 @@
99

1010
import javax.money.MonetaryAmount;
1111

12-
import com.commercetools.api.models.cart.*;
12+
import com.commercetools.api.models.cart.CartOrigin;
13+
import com.commercetools.api.models.cart.CustomLineItem;
14+
import com.commercetools.api.models.cart.DiscountCodeInfo;
15+
import com.commercetools.api.models.cart.InventoryMode;
16+
import com.commercetools.api.models.cart.LineItem;
17+
import com.commercetools.api.models.cart.RoundingMode;
18+
import com.commercetools.api.models.cart.ShippingInfo;
19+
import com.commercetools.api.models.cart.ShippingRateInput;
20+
import com.commercetools.api.models.cart.TaxCalculationMode;
21+
import com.commercetools.api.models.cart.TaxMode;
22+
import com.commercetools.api.models.cart.TaxedPrice;
1323
import com.commercetools.api.models.cart_discount.CartDiscountReference;
14-
import com.commercetools.api.models.common.*;
24+
import com.commercetools.api.models.common.Address;
25+
import com.commercetools.api.models.common.CreatedBy;
26+
import com.commercetools.api.models.common.LastModifiedBy;
27+
import com.commercetools.api.models.common.MonetaryAmountConvertable;
28+
import com.commercetools.api.models.common.Money;
29+
import com.commercetools.api.models.common.TypedMoney;
1530
import com.commercetools.api.models.customer_group.CustomerGroupReference;
1631
import com.commercetools.api.models.store.StoreKeyReference;
1732
import com.commercetools.api.models.type.CustomFields;

‎examples/split-packages/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,16 @@
5151
<artifactId>commercetools-sdk-java-api-models_category</artifactId>
5252
<version>${commercetools.version}</version>
5353
</dependency>
54+
<dependency>
55+
<groupId>com.commercetools.sdk</groupId>
56+
<artifactId>commercetools-sdk-java-api-models_common</artifactId>
57+
<version>${commercetools.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.commercetools.sdk</groupId>
61+
<artifactId>commercetools-sdk-java-api-models_error</artifactId>
62+
<version>${commercetools.version}</version>
63+
</dependency>
5464
<dependency>
5565
<groupId>com.commercetools.sdk</groupId>
5666
<artifactId>commercetools-sdk-java-api-predicates</artifactId>

‎examples/split-packages/src/test/java/com/commercetools/sdk/examples/GettingStartedTests.java‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
import com.commercetools.api.client.ProjectApiRoot;
44
import com.commercetools.api.defaultconfig.ApiRootBuilder;
55
import com.commercetools.api.defaultconfig.ServiceRegion;
6+
import com.commercetools.api.models.category.Category;
67
import com.commercetools.api.models.category.CategoryPagedQueryResponse;
78
import com.commercetools.api.models.project.Project;
9+
import com.commercetools.api.models.common.LocalizedString;
810
import io.vrap.rmf.base.client.oauth2.ClientCredentials;
911
import org.junit.jupiter.api.Assertions;
1012
import org.junit.jupiter.api.Test;
1113

14+
import java.util.List;
1215
import java.util.Optional;
16+
import java.util.Random;
17+
import java.util.UUID;
18+
import java.util.stream.Collectors;
1319

1420
public class GettingStartedTests {
1521

@@ -34,14 +40,40 @@ public void category() {
3440
ClientCredentials.of().withClientId(System.getenv("CTP_CLIENT_ID"))
3541
.withClientSecret(System.getenv("CTP_CLIENT_SECRET"))
3642
.build(),
37-
ServiceRegion.valueOf(Optional.ofNullable(System.getenv("CTP_SERVICE_REGION")).orElse("GCP_EUROPE_WEST1"))).build(System.getenv("CTP_PROJECT_KEY"));
43+
ServiceRegion.valueOf(Optional.ofNullable(System.getenv("CTP_SERVICE_REGION")).orElse("GCP_EUROPE_WEST1")))
44+
.addNotFoundExceptionMiddleware()
45+
.build(System.getenv("CTP_PROJECT_KEY"));
46+
47+
Category cat1 = apiRoot.categories().withKey("cat1").get().executeBlocking().getBody();
48+
if (cat1 == null) {
49+
cat1 = apiRoot.categories().create(b -> b
50+
.key("cat1")
51+
.name(LocalizedString.ofEnglish("cat1"))
52+
.slug(LocalizedString.ofEnglish("cat1" + UUID.randomUUID().toString()))
53+
).executeBlocking().getBody();
54+
}
55+
Category cat2 = apiRoot.categories().withKey("cat2").get().executeBlocking().getBody();
56+
if (cat2 == null) {
57+
Category finalCat1 = cat1;
58+
apiRoot.categories().create(b -> b
59+
.key("cat2")
60+
.name(LocalizedString.ofEnglish("cat2"))
61+
.slug(LocalizedString.ofEnglish("cat2" + UUID.randomUUID().toString()))
62+
.parent(finalCat1.toResourceIdentifier())
63+
).executeBlocking();
64+
}
3865

3966
CategoryPagedQueryResponse response = apiRoot
4067
.categories()
4168
.get()
4269
.addLimit(500)
70+
.withWhere("key = \"cat1\" or key = \"cat2\"")
4371
.executeBlocking().getBody();
4472

4573
Assertions.assertNotNull(response);
74+
75+
List<String> categories = response.getResults().stream().map(Category::getKey).collect(Collectors.toList());
76+
Assertions.assertTrue(categories.contains("cat1"));
77+
Assertions.assertTrue(categories.contains("cat2"));
4678
}
4779
}

0 commit comments

Comments
 (0)