From e7792fa994b94090f3f5c0ff7e5243235b36c897 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 12 Feb 2021 11:49:44 +0100 Subject: [PATCH 1/2] Configure multiple URLs for order validation --- .../platform/apiclient/dto/ApiVersion.java | 3 ++- .../apiclient/dto/model/dto/ProductDTO.java | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java index 54ffd2580..c42ca703d 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java @@ -2,6 +2,7 @@ public final class ApiVersion { + public static final long V20210212 = 20210212; public static final long V20210125 = 20210125; public static final long V20201202 = 20201202; public static final long V20201126 = 20201126; @@ -31,7 +32,7 @@ public final class ApiVersion public static final long V20180101 = 20180101; public static final long NO_VERSION = 0; - public static final Long LATEST_API_VERSION = V20210125; + public static final Long LATEST_API_VERSION = V20210212; private ApiVersion() { diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java index 5fe850c0d..716dc4a9d 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java @@ -209,8 +209,13 @@ public class ProductDTO extends NamedEntityDTO implements ProductL10nDTO, Compar @Size( max = 65536, message = INVALID_SIZE ) private String tosAcceptance; - @ApiModelProperty( "URL to call for order validation" ) + @ApiModelProperty( "URLs to call for order validation" ) + @FieldAPI( sinceVersion = ApiVersion.V20210212 ) + private Set<@Size( max = 2000 ) @URL String> orderValidationUrls; + + @ApiModelProperty( hidden = true ) @Size( max = 2000 ) + @UnsupportedAPI( sinceVersion = ApiVersion.V20210212 ) @URL private String orderValidationUrl; @@ -756,11 +761,23 @@ public void setSubscriptionApproval( Boolean subscriptionApproval ) this.subscriptionApproval = subscriptionApproval; } + public Set getOrderValidationUrls() + { + return orderValidationUrls; + } + + public void setOrderValidationUrls( Set orderValidationUrls ) + { + this.orderValidationUrls = orderValidationUrls; + } + + @Deprecated public String getOrderValidationUrl() { return orderValidationUrl; } + @Deprecated public void setOrderValidationUrl( String orderValidationUrl ) { this.orderValidationUrl = orderValidationUrl; From e742733fd5c1c3f01d5f2bf7fb654781d1cf11b5 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Mon, 15 Feb 2021 14:15:26 +0100 Subject: [PATCH 2/2] Synchronize version --- .../com/cloudesire/platform/apiclient/dto/ApiVersion.java | 4 ++-- .../platform/apiclient/dto/model/dto/ProductDTO.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java index c42ca703d..b2e110417 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/ApiVersion.java @@ -2,7 +2,7 @@ public final class ApiVersion { - public static final long V20210212 = 20210212; + public static final long V20210215 = 20210215; public static final long V20210125 = 20210125; public static final long V20201202 = 20201202; public static final long V20201126 = 20201126; @@ -32,7 +32,7 @@ public final class ApiVersion public static final long V20180101 = 20180101; public static final long NO_VERSION = 0; - public static final Long LATEST_API_VERSION = V20210212; + public static final Long LATEST_API_VERSION = V20210215; private ApiVersion() { diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java index 716dc4a9d..42aab1b2b 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java @@ -210,12 +210,12 @@ public class ProductDTO extends NamedEntityDTO implements ProductL10nDTO, Compar private String tosAcceptance; @ApiModelProperty( "URLs to call for order validation" ) - @FieldAPI( sinceVersion = ApiVersion.V20210212 ) + @FieldAPI( sinceVersion = ApiVersion.V20210215 ) private Set<@Size( max = 2000 ) @URL String> orderValidationUrls; @ApiModelProperty( hidden = true ) @Size( max = 2000 ) - @UnsupportedAPI( sinceVersion = ApiVersion.V20210212 ) + @UnsupportedAPI( sinceVersion = ApiVersion.V20210215 ) @URL private String orderValidationUrl;