diff --git a/README.md b/README.md index bd4e1916..b30abb28 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you use Maven, we also host [Maven Artifacts](https://github.com/talon-one/ma Building the API client library requires: -1. Java 1.7+ +1. Java 21+ 2. Maven/Gradle ## Installation @@ -35,7 +35,7 @@ Add this dependency to your project's POM: one.talon talon-one-client - 13.0.0 + 13.1.0 compile ``` @@ -45,7 +45,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "one.talon:talon-one-client:13.0.0" +compile "one.talon:talon-one-client:13.1.0" ``` ### Others diff --git a/build.gradle b/build.gradle index 9708b077..e5a70663 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'eclipse' apply plugin: 'java' group = 'one.talon' -version = '13.0.0' +version = '13.1.0' buildscript { repositories { diff --git a/build.sbt b/build.sbt index 5f89efd7..371cf7fd 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "one.talon", name := "talon-one-client", - version := "13.0.0", + version := "13.1.0", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/pom.xml b/pom.xml index 1ffbafeb..ddb5564a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ talon-one-client jar talon-one-client - 13.0.0 + 13.1.0 https://github.com/talon-one/maven-artefacts Talon.One unified JAVA SDK. It allows for programmatic access to the integration and management API with their respective authentication strategies diff --git a/src/main/java/one/talon/ApiClient.java b/src/main/java/one/talon/ApiClient.java index dca6c2be..29913289 100644 --- a/src/main/java/one/talon/ApiClient.java +++ b/src/main/java/one/talon/ApiClient.java @@ -132,7 +132,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/13.0.0/java"); + setUserAgent("OpenAPI-Generator/13.1.0/java"); authentications = new HashMap(); } diff --git a/src/main/java/one/talon/model/CartItem.java b/src/main/java/one/talon/model/CartItem.java index 63b87b0d..05914ce2 100644 --- a/src/main/java/one/talon/model/CartItem.java +++ b/src/main/java/one/talon/model/CartItem.java @@ -27,8 +27,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import one.talon.model.AdditionalCost; +import one.talon.model.PriceDetail; import one.talon.model.Product; +import org.threeten.bp.OffsetDateTime; /** * CartItem @@ -99,6 +102,26 @@ public class CartItem { @SerializedName(SERIALIZED_NAME_CATALOG_ITEM_I_D) private Long catalogItemID; + public static final String SERIALIZED_NAME_SELECTED_PRICE_TYPE = "selectedPriceType"; + @SerializedName(SERIALIZED_NAME_SELECTED_PRICE_TYPE) + private String selectedPriceType; + + public static final String SERIALIZED_NAME_ADJUSTMENT_REFERENCE_ID = "adjustmentReferenceId"; + @SerializedName(SERIALIZED_NAME_ADJUSTMENT_REFERENCE_ID) + private UUID adjustmentReferenceId; + + public static final String SERIALIZED_NAME_ADJUSTMENT_EFFECTIVE_FROM = "adjustmentEffectiveFrom"; + @SerializedName(SERIALIZED_NAME_ADJUSTMENT_EFFECTIVE_FROM) + private OffsetDateTime adjustmentEffectiveFrom; + + public static final String SERIALIZED_NAME_ADJUSTMENT_EFFECTIVE_UNTIL = "adjustmentEffectiveUntil"; + @SerializedName(SERIALIZED_NAME_ADJUSTMENT_EFFECTIVE_UNTIL) + private OffsetDateTime adjustmentEffectiveUntil; + + public static final String SERIALIZED_NAME_PRICES = "prices"; + @SerializedName(SERIALIZED_NAME_PRICES) + private Map prices = null; + public CartItem name(String name) { @@ -459,11 +482,11 @@ public CartItem catalogItemID(Long catalogItemID) { } /** - * The [catalog item ID](https://docs.talon.one/docs/product/account/dev-tools/managing-cart-item-catalogs/#synchronizing-a-cart-item-catalog). + * The catalog item ID. * @return catalogItemID **/ @javax.annotation.Nullable - @ApiModelProperty(value = "The [catalog item ID](https://docs.talon.one/docs/product/account/dev-tools/managing-cart-item-catalogs/#synchronizing-a-cart-item-catalog).") + @ApiModelProperty(value = "The catalog item ID.") public Long getCatalogItemID() { return catalogItemID; @@ -475,6 +498,129 @@ public void setCatalogItemID(Long catalogItemID) { } + public CartItem selectedPriceType(String selectedPriceType) { + + this.selectedPriceType = selectedPriceType; + return this; + } + + /** + * The selected price type for this cart item (e.g. the price for members only). + * @return selectedPriceType + **/ + @javax.annotation.Nullable + @ApiModelProperty(example = "member", value = "The selected price type for this cart item (e.g. the price for members only).") + + public String getSelectedPriceType() { + return selectedPriceType; + } + + + public void setSelectedPriceType(String selectedPriceType) { + this.selectedPriceType = selectedPriceType; + } + + + public CartItem adjustmentReferenceId(UUID adjustmentReferenceId) { + + this.adjustmentReferenceId = adjustmentReferenceId; + return this; + } + + /** + * The reference ID of the selected price adjustment for this cart item. Only returned if the selected price resulted from a price adjustment. + * @return adjustmentReferenceId + **/ + @javax.annotation.Nullable + @ApiModelProperty(example = "68851723-e6fa-488f-ace9-112581e6c19b", value = "The reference ID of the selected price adjustment for this cart item. Only returned if the selected price resulted from a price adjustment.") + + public UUID getAdjustmentReferenceId() { + return adjustmentReferenceId; + } + + + public void setAdjustmentReferenceId(UUID adjustmentReferenceId) { + this.adjustmentReferenceId = adjustmentReferenceId; + } + + + public CartItem adjustmentEffectiveFrom(OffsetDateTime adjustmentEffectiveFrom) { + + this.adjustmentEffectiveFrom = adjustmentEffectiveFrom; + return this; + } + + /** + * The date and time from which the price adjustment is effective. Only returned if the selected price resulted from a price adjustment that contains this field. + * @return adjustmentEffectiveFrom + **/ + @javax.annotation.Nullable + @ApiModelProperty(example = "2021-09-12T10:12:42Z", value = "The date and time from which the price adjustment is effective. Only returned if the selected price resulted from a price adjustment that contains this field.") + + public OffsetDateTime getAdjustmentEffectiveFrom() { + return adjustmentEffectiveFrom; + } + + + public void setAdjustmentEffectiveFrom(OffsetDateTime adjustmentEffectiveFrom) { + this.adjustmentEffectiveFrom = adjustmentEffectiveFrom; + } + + + public CartItem adjustmentEffectiveUntil(OffsetDateTime adjustmentEffectiveUntil) { + + this.adjustmentEffectiveUntil = adjustmentEffectiveUntil; + return this; + } + + /** + * The date and time until which the price adjustment is effective. Only returned if the selected price resulted from a price adjustment that contains this field. + * @return adjustmentEffectiveUntil + **/ + @javax.annotation.Nullable + @ApiModelProperty(example = "2021-09-12T10:12:42Z", value = "The date and time until which the price adjustment is effective. Only returned if the selected price resulted from a price adjustment that contains this field.") + + public OffsetDateTime getAdjustmentEffectiveUntil() { + return adjustmentEffectiveUntil; + } + + + public void setAdjustmentEffectiveUntil(OffsetDateTime adjustmentEffectiveUntil) { + this.adjustmentEffectiveUntil = adjustmentEffectiveUntil; + } + + + public CartItem prices(Map prices) { + + this.prices = prices; + return this; + } + + public CartItem putPricesItem(String key, PriceDetail pricesItem) { + if (this.prices == null) { + this.prices = new HashMap(); + } + this.prices.put(key, pricesItem); + return this; + } + + /** + * A map of keys and values representing the price types and related price adjustment details for this cart item. The keys correspond to the `priceType` names. + * @return prices + **/ + @javax.annotation.Nullable + @ApiModelProperty(example = "{\"member\":{\"price\":90,\"adjustmentReferenceId\":\"68851723-e6fa-488f-ace9-112581e6c19b\",\"effectiveFrom\":\"2025-05-25T00:00:00Z\",\"effectiveUntil\":\"2025-05-30T00:00:00Z\"},\"base\":{\"price\":100}}", value = "A map of keys and values representing the price types and related price adjustment details for this cart item. The keys correspond to the `priceType` names. ") + + public Map getPrices() { + return prices; + } + + + public void setPrices(Map prices) { + this.prices = prices; + } + + @Override public boolean equals(java.lang.Object o) { if (this == o) { @@ -499,12 +645,17 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.position, cartItem.position) && Objects.equals(this.attributes, cartItem.attributes) && Objects.equals(this.additionalCosts, cartItem.additionalCosts) && - Objects.equals(this.catalogItemID, cartItem.catalogItemID); + Objects.equals(this.catalogItemID, cartItem.catalogItemID) && + Objects.equals(this.selectedPriceType, cartItem.selectedPriceType) && + Objects.equals(this.adjustmentReferenceId, cartItem.adjustmentReferenceId) && + Objects.equals(this.adjustmentEffectiveFrom, cartItem.adjustmentEffectiveFrom) && + Objects.equals(this.adjustmentEffectiveUntil, cartItem.adjustmentEffectiveUntil) && + Objects.equals(this.prices, cartItem.prices); } @Override public int hashCode() { - return Objects.hash(name, sku, quantity, returnedQuantity, remainingQuantity, price, category, product, weight, height, width, length, position, attributes, additionalCosts, catalogItemID); + return Objects.hash(name, sku, quantity, returnedQuantity, remainingQuantity, price, category, product, weight, height, width, length, position, attributes, additionalCosts, catalogItemID, selectedPriceType, adjustmentReferenceId, adjustmentEffectiveFrom, adjustmentEffectiveUntil, prices); } @@ -528,6 +679,11 @@ public String toString() { sb.append(" attributes: ").append(toIndentedString(attributes)).append("\n"); sb.append(" additionalCosts: ").append(toIndentedString(additionalCosts)).append("\n"); sb.append(" catalogItemID: ").append(toIndentedString(catalogItemID)).append("\n"); + sb.append(" selectedPriceType: ").append(toIndentedString(selectedPriceType)).append("\n"); + sb.append(" adjustmentReferenceId: ").append(toIndentedString(adjustmentReferenceId)).append("\n"); + sb.append(" adjustmentEffectiveFrom: ").append(toIndentedString(adjustmentEffectiveFrom)).append("\n"); + sb.append(" adjustmentEffectiveUntil: ").append(toIndentedString(adjustmentEffectiveUntil)).append("\n"); + sb.append(" prices: ").append(toIndentedString(prices)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/one/talon/model/IntegrationEventV2Request.java b/src/main/java/one/talon/model/IntegrationEventV2Request.java index 5622461e..6b2f221a 100644 --- a/src/main/java/one/talon/model/IntegrationEventV2Request.java +++ b/src/main/java/one/talon/model/IntegrationEventV2Request.java @@ -51,6 +51,10 @@ public class IntegrationEventV2Request { @SerializedName(SERIALIZED_NAME_ATTRIBUTES) private Object attributes; + public static final String SERIALIZED_NAME_LOYALTY_CARDS = "loyaltyCards"; + @SerializedName(SERIALIZED_NAME_LOYALTY_CARDS) + private List loyaltyCards = null; + /** * Gets or Sets responseContent */ @@ -233,6 +237,37 @@ public void setAttributes(Object attributes) { } + public IntegrationEventV2Request loyaltyCards(List loyaltyCards) { + + this.loyaltyCards = loyaltyCards; + return this; + } + + public IntegrationEventV2Request addLoyaltyCardsItem(String loyaltyCardsItem) { + if (this.loyaltyCards == null) { + this.loyaltyCards = new ArrayList(); + } + this.loyaltyCards.add(loyaltyCardsItem); + return this; + } + + /** + * Identifier of the loyalty card used during this event. + * @return loyaltyCards + **/ + @javax.annotation.Nullable + @ApiModelProperty(example = "[loyalty-card-1]", value = "Identifier of the loyalty card used during this event.") + + public List getLoyaltyCards() { + return loyaltyCards; + } + + + public void setLoyaltyCards(List loyaltyCards) { + this.loyaltyCards = loyaltyCards; + } + + public IntegrationEventV2Request responseContent(List responseContent) { this.responseContent = responseContent; @@ -278,12 +313,13 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.evaluableCampaignIds, integrationEventV2Request.evaluableCampaignIds) && Objects.equals(this.type, integrationEventV2Request.type) && Objects.equals(this.attributes, integrationEventV2Request.attributes) && + Objects.equals(this.loyaltyCards, integrationEventV2Request.loyaltyCards) && Objects.equals(this.responseContent, integrationEventV2Request.responseContent); } @Override public int hashCode() { - return Objects.hash(profileId, storeIntegrationId, evaluableCampaignIds, type, attributes, responseContent); + return Objects.hash(profileId, storeIntegrationId, evaluableCampaignIds, type, attributes, loyaltyCards, responseContent); } @@ -296,6 +332,7 @@ public String toString() { sb.append(" evaluableCampaignIds: ").append(toIndentedString(evaluableCampaignIds)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" attributes: ").append(toIndentedString(attributes)).append("\n"); + sb.append(" loyaltyCards: ").append(toIndentedString(loyaltyCards)).append("\n"); sb.append(" responseContent: ").append(toIndentedString(responseContent)).append("\n"); sb.append("}"); return sb.toString();