From a29b025cdcbaadb33edf021473a53f271ce442dd Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 1 Oct 2021 16:15:17 +0200 Subject: [PATCH 1/2] Move validation service DTOs to cmw --- .../dto/BaseExternalOrderValidationDTO.java | 64 ----------------- ...onfigurationParameterValuesRequestDTO.java | 16 ----- .../model/dto/ExternalOrderValidationDTO.java | 68 ------------------- 3 files changed, 148 deletions(-) delete mode 100644 cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseExternalOrderValidationDTO.java delete mode 100644 cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java delete mode 100644 cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalOrderValidationDTO.java diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseExternalOrderValidationDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseExternalOrderValidationDTO.java deleted file mode 100644 index 97152c5f0..000000000 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseExternalOrderValidationDTO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.cloudesire.platform.apiclient.dto.model.dto; - -abstract class BaseExternalOrderValidationDTO implements DTO -{ - private Integer productId; - - private String productIdentifier; - - private Integer productVersionId; - - private String productVersionIdentifier; - - private String language; - - public Integer getProductId() - { - return productId; - } - - public void setProductId( Integer productId ) - { - this.productId = productId; - } - - public String getProductIdentifier() - { - return productIdentifier; - } - - public void setProductIdentifier( String productIdentifier ) - { - this.productIdentifier = productIdentifier; - } - - public Integer getProductVersionId() - { - return productVersionId; - } - - public void setProductVersionId( Integer productVersionId ) - { - this.productVersionId = productVersionId; - } - - public String getProductVersionIdentifier() - { - return productVersionIdentifier; - } - - public void setProductVersionIdentifier( String productVersionIdentifier ) - { - this.productVersionIdentifier = productVersionIdentifier; - } - - public String getLanguage() - { - return language; - } - - public void setLanguage( String language ) - { - this.language = language; - } -} diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java deleted file mode 100644 index d607df71e..000000000 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cloudesire.platform.apiclient.dto.model.dto; - -public class ExternalConfigurationParameterValuesRequestDTO extends BaseExternalOrderValidationDTO -{ - private String configurationParameter; - - public String getConfigurationParameter() - { - return configurationParameter; - } - - public void setConfigurationParameter( String configurationParameter ) - { - this.configurationParameter = configurationParameter; - } -} diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalOrderValidationDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalOrderValidationDTO.java deleted file mode 100644 index fef49e52a..000000000 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalOrderValidationDTO.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.cloudesire.platform.apiclient.dto.model.dto; - -import com.cloudesire.platform.apiclient.dto.model.enums.OrderType; - -import java.util.Map; - -public class ExternalOrderValidationDTO extends BaseExternalOrderValidationDTO -{ - private Map billingItems; - - private Map configurationParameters; - - private Integer subscriptionId; - - private Integer buyerId; - - private OrderType orderType; - - public Map getBillingItems() - { - return billingItems; - } - - public void setBillingItems( Map billingItems ) - { - this.billingItems = billingItems; - } - - public Map getConfigurationParameters() - { - return configurationParameters; - } - - public void setConfigurationParameters( Map configurationParameters ) - { - this.configurationParameters = configurationParameters; - } - - public Integer getSubscriptionId() - { - return subscriptionId; - } - - public void setSubscriptionId( Integer subscriptionId ) - { - this.subscriptionId = subscriptionId; - } - - public Integer getBuyerId() - { - return buyerId; - } - - public void setBuyerId( Integer buyerId ) - { - this.buyerId = buyerId; - } - - public OrderType getOrderType() - { - return orderType; - } - - public void setOrderType( OrderType orderType ) - { - this.orderType = orderType; - } -} From 0222726858bed944713daa5376d5b13ccea057f4 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 1 Oct 2021 17:07:47 +0200 Subject: [PATCH 2/2] Pass current parameters to external values service --- ...onfigurationParameterValuesRequestDTO.java | 35 +++++++++++++++++++ .../api/ConfigurationParameterApi.java | 6 ++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java new file mode 100644 index 000000000..5e57430fc --- /dev/null +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ExternalConfigurationParameterValuesRequestDTO.java @@ -0,0 +1,35 @@ +package com.cloudesire.platform.apiclient.dto.model.dto; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.Map; + +public class ExternalConfigurationParameterValuesRequestDTO implements DTO +{ + @NotNull + @Valid + private UrlEntityDTO productVersion; + + @Valid + private Map configurationParameters; + + public UrlEntityDTO getProductVersion() + { + return productVersion; + } + + public void setProductVersion( UrlEntityDTO productVersion ) + { + this.productVersion = productVersion; + } + + public Map getConfigurationParameters() + { + return configurationParameters; + } + + public void setConfigurationParameters( Map configurationParameters ) + { + this.configurationParameters = configurationParameters; + } +} diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/ConfigurationParameterApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/ConfigurationParameterApi.java index db5c46d7f..1d9f18870 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/ConfigurationParameterApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/ConfigurationParameterApi.java @@ -2,11 +2,12 @@ import com.cloudesire.platform.apiclient.dto.model.dto.ConfigurationParameterDTO; import com.cloudesire.platform.apiclient.dto.model.dto.ConfigurationParameterValuesDTO; +import com.cloudesire.platform.apiclient.dto.model.dto.ExternalConfigurationParameterValuesRequestDTO; import retrofit2.Call; +import retrofit2.http.Body; import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Path; -import retrofit2.http.Query; public interface ConfigurationParameterApi { @@ -14,5 +15,6 @@ public interface ConfigurationParameterApi Call get( @Path( "id" ) int id ); @POST( "configurationParameter/{id}/values" ) - Call getValues( @Path( "id" ) int id, @Query( "productVersionId" ) int productVersionId ); + Call getValues( @Path( "id" ) int id, + @Body ExternalConfigurationParameterValuesRequestDTO input ); }