diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj index fc4f48b..15f3be2 100644 --- a/Generator/Generator.csproj +++ b/Generator/Generator.csproj @@ -9,7 +9,7 @@ - + diff --git a/Generator/Generator.sln.DotSettings b/Generator/Generator.sln.DotSettings new file mode 100644 index 0000000..f7bddd5 --- /dev/null +++ b/Generator/Generator.sln.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/Generator/Program.cs b/Generator/Program.cs index fd1197f..f8e73ed 100644 --- a/Generator/Program.cs +++ b/Generator/Program.cs @@ -37,10 +37,10 @@ var javaClientWriter = new JavaClientWriter(javaWriter); -javaClientWriter.GenerateClientClass(typeof(Tracker), new[] { "Track" }); -javaClientWriter.GenerateClientClass(typeof(Searcher), new[] { "Search", "Predict", "Batch" }); -javaClientWriter.GenerateClientClass(typeof(Recommender), new[] { "Recommend" }); -javaClientWriter.GenerateClientClass(typeof(SearchAdministrator), new[] { "Delete", "Save", "Load" }); +javaClientWriter.GenerateClientClass(typeof(Tracker), ["Track"]); +javaClientWriter.GenerateClientClass(typeof(Searcher), ["Search", "Predict", "Batch"]); +javaClientWriter.GenerateClientClass(typeof(Recommender), ["Recommend"]); +javaClientWriter.GenerateClientClass(typeof(SearchAdministrator), ["Delete", "Save", "Load"]); if (javaWriter.MissingTypeDefinitions.Count > 0) { diff --git a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics.java b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics.java index be64eb7..7f52388 100644 --- a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics.java +++ b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics.java @@ -19,16 +19,16 @@ public class CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics { public OffsetDateTime periodFromUtc; - public Integer views; + public Integer promotions; public Integer clicks; - public static CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics create(OffsetDateTime periodFromUtc, Integer views, Integer clicks) + public static CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics create(OffsetDateTime periodFromUtc, Integer promotions, Integer clicks) { - return new CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics(periodFromUtc, views, clicks); + return new CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics(periodFromUtc, promotions, clicks); } - public CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics(OffsetDateTime periodFromUtc, Integer views, Integer clicks) + public CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics(OffsetDateTime periodFromUtc, Integer promotions, Integer clicks) { this.periodFromUtc = periodFromUtc; - this.views = views; + this.promotions = promotions; this.clicks = clicks; } public CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics() @@ -38,9 +38,9 @@ public OffsetDateTime getPeriodFromUtc() { return this.periodFromUtc; } - public Integer getViews() + public Integer getPromotions() { - return this.views; + return this.promotions; } public Integer getClicks() { @@ -51,9 +51,9 @@ public CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics setPeriodFromUtc(OffsetD this.periodFromUtc = periodFromUtc; return this; } - public CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics setViews(Integer views) + public CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics setPromotions(Integer promotions) { - this.views = views; + this.promotions = promotions; return this; } public CampaignAnalyticsDisplayAdAnalyticsPeriodMetrics setClicks(Integer clicks) diff --git a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics.java b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics.java index f824dd2..7131e51 100644 --- a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics.java +++ b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics.java @@ -22,6 +22,7 @@ public class CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics public Integer promotions; public Integer lastClickedUnixMinutes; public Integer numberOfTimesClicked; + public DisplayAdResult displayAd; public static CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics create(String displayAdId, Integer promotions, Integer lastClickedUnixMinutes, Integer numberOfTimesClicked) { return new CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics(displayAdId, promotions, lastClickedUnixMinutes, numberOfTimesClicked); @@ -52,6 +53,10 @@ public Integer getNumberOfTimesClicked() { return this.numberOfTimesClicked; } + public DisplayAdResult getDisplayAd() + { + return this.displayAd; + } public CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics setDisplayAdId(String displayAdId) { this.displayAdId = displayAdId; @@ -72,4 +77,9 @@ public CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics setNumberOfTi this.numberOfTimesClicked = numberOfTimesClicked; return this; } + public CampaignAnalyticsDisplayAdAnalyticsPromotedDisplayAdMetrics setDisplayAd(DisplayAdResult displayAd) + { + this.displayAd = displayAd; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPeriodMetrics.java b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPeriodMetrics.java index 0e7f4ed..4551bd0 100644 --- a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPeriodMetrics.java +++ b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPeriodMetrics.java @@ -22,16 +22,18 @@ public class CampaignAnalyticsProductAnalyticsPeriodMetrics public Integer views; public Integer salesQuantity; public CampaignAnalyticsProductAnalyticsPeriodMetricsCurrencyMetrics[] currencies; - public static CampaignAnalyticsProductAnalyticsPeriodMetrics create(OffsetDateTime periodFromUtc, Integer views, Integer salesQuantity, CampaignAnalyticsProductAnalyticsPeriodMetricsCurrencyMetrics... currencies) + public Integer promotions; + public static CampaignAnalyticsProductAnalyticsPeriodMetrics create(OffsetDateTime periodFromUtc, Integer views, Integer salesQuantity, CampaignAnalyticsProductAnalyticsPeriodMetricsCurrencyMetrics[] currencies, Integer promotions) { - return new CampaignAnalyticsProductAnalyticsPeriodMetrics(periodFromUtc, views, salesQuantity, currencies); + return new CampaignAnalyticsProductAnalyticsPeriodMetrics(periodFromUtc, views, salesQuantity, currencies, promotions); } - public CampaignAnalyticsProductAnalyticsPeriodMetrics(OffsetDateTime periodFromUtc, Integer views, Integer salesQuantity, CampaignAnalyticsProductAnalyticsPeriodMetricsCurrencyMetrics... currencies) + public CampaignAnalyticsProductAnalyticsPeriodMetrics(OffsetDateTime periodFromUtc, Integer views, Integer salesQuantity, CampaignAnalyticsProductAnalyticsPeriodMetricsCurrencyMetrics[] currencies, Integer promotions) { this.periodFromUtc = periodFromUtc; this.views = views; this.salesQuantity = salesQuantity; this.currencies = currencies; + this.promotions = promotions; } public CampaignAnalyticsProductAnalyticsPeriodMetrics() { @@ -52,6 +54,10 @@ public CampaignAnalyticsProductAnalyticsPeriodMetricsCurrencyMetrics[] getCurren { return this.currencies; } + public Integer getPromotions() + { + return this.promotions; + } public CampaignAnalyticsProductAnalyticsPeriodMetrics setPeriodFromUtc(OffsetDateTime periodFromUtc) { this.periodFromUtc = periodFromUtc; @@ -86,4 +92,9 @@ public CampaignAnalyticsProductAnalyticsPeriodMetrics addToCurrencies(CampaignAn } return this; } + public CampaignAnalyticsProductAnalyticsPeriodMetrics setPromotions(Integer promotions) + { + this.promotions = promotions; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPromotedProductMetrics.java b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPromotedProductMetrics.java index 51ffba4..351951f 100644 --- a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPromotedProductMetrics.java +++ b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsProductAnalyticsPromotedProductMetrics.java @@ -20,6 +20,7 @@ public class CampaignAnalyticsProductAnalyticsPromotedProductMetrics { public String productId; public Integer promotions; + public ProductResult product; public static CampaignAnalyticsProductAnalyticsPromotedProductMetrics create(String productId, Integer promotions) { return new CampaignAnalyticsProductAnalyticsPromotedProductMetrics(productId, promotions); @@ -40,6 +41,10 @@ public Integer getPromotions() { return this.promotions; } + public ProductResult getProduct() + { + return this.product; + } public CampaignAnalyticsProductAnalyticsPromotedProductMetrics setProductId(String productId) { this.productId = productId; @@ -50,4 +55,9 @@ public CampaignAnalyticsProductAnalyticsPromotedProductMetrics setPromotions(Int this.promotions = promotions; return this; } + public CampaignAnalyticsProductAnalyticsPromotedProductMetrics setProduct(ProductResult product) + { + this.product = product; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsRequest.java b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsRequest.java index 711308f..97b2b07 100644 --- a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsRequest.java +++ b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsRequest.java @@ -30,6 +30,10 @@ public class CampaignAnalyticsRequest extends LicensedRequest public LocalDateTimeRange periodUtc; public @Nullable FilterCollection productFilters; public @Nullable FilterCollection displayAdFilters; + public @Nullable Language language; + public @Nullable Currency currency; + public @Nullable SelectedProductPropertiesSettings selectedProductProperties; + public @Nullable SelectedDisplayAdPropertiesSettings selectedDisplayAdProperties; public static CampaignAnalyticsRequest create(UUID id, LocalDateTimeRange periodUtc, @Nullable FilterCollection productFilters, @Nullable FilterCollection displayAdFilters) { return new CampaignAnalyticsRequest(id, periodUtc, productFilters, displayAdFilters); @@ -61,6 +65,22 @@ public LocalDateTimeRange getPeriodUtc() { return this.displayAdFilters; } + public @Nullable Language getLanguage() + { + return this.language; + } + public @Nullable Currency getCurrency() + { + return this.currency; + } + public @Nullable SelectedProductPropertiesSettings getSelectedProductProperties() + { + return this.selectedProductProperties; + } + public @Nullable SelectedDisplayAdPropertiesSettings getSelectedDisplayAdProperties() + { + return this.selectedDisplayAdProperties; + } /** The campaign to provide analytics for. */ public CampaignAnalyticsRequest setId(UUID id) { @@ -82,4 +102,24 @@ public CampaignAnalyticsRequest setDisplayAdFilters(@Nullable FilterCollection d this.displayAdFilters = displayAdFilters; return this; } + public CampaignAnalyticsRequest setLanguage(@Nullable Language language) + { + this.language = language; + return this; + } + public CampaignAnalyticsRequest setCurrency(@Nullable Currency currency) + { + this.currency = currency; + return this; + } + public CampaignAnalyticsRequest setSelectedProductProperties(@Nullable SelectedProductPropertiesSettings selectedProductProperties) + { + this.selectedProductProperties = selectedProductProperties; + return this; + } + public CampaignAnalyticsRequest setSelectedDisplayAdProperties(@Nullable SelectedDisplayAdPropertiesSettings selectedDisplayAdProperties) + { + this.selectedDisplayAdProperties = selectedDisplayAdProperties; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/CategoryIndexConfiguration.java b/src/src/main/java/com/relewise/client/model/CategoryIndexConfiguration.java index 39253af..4dce0c4 100644 --- a/src/src/main/java/com/relewise/client/model/CategoryIndexConfiguration.java +++ b/src/src/main/java/com/relewise/client/model/CategoryIndexConfiguration.java @@ -18,7 +18,10 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class CategoryIndexConfiguration { + /** Default configuration entry used when no specific category scope is specified. This serves as the fallback configuration for category indexing operations. */ public CategoryIndexConfigurationEntry unspecified; + /** Scope-specific configuration entries mapped by CategoryScope enum values. Allows different indexing configurations for different category relationship scopes (e.g., ImmediateParent, ImmediateParentOrItsParent, Ancestor). When null, only the Unspecified configuration will be used. */ + public @Nullable HashMap byScope; public static CategoryIndexConfiguration create() { return new CategoryIndexConfiguration(); @@ -26,13 +29,36 @@ public static CategoryIndexConfiguration create() public CategoryIndexConfiguration() { } + /** Default configuration entry used when no specific category scope is specified. This serves as the fallback configuration for category indexing operations. */ public CategoryIndexConfigurationEntry getUnspecified() { return this.unspecified; } + /** Scope-specific configuration entries mapped by CategoryScope enum values. Allows different indexing configurations for different category relationship scopes (e.g., ImmediateParent, ImmediateParentOrItsParent, Ancestor). When null, only the Unspecified configuration will be used. */ + public @Nullable HashMap getByScope() + { + return this.byScope; + } + /** Default configuration entry used when no specific category scope is specified. This serves as the fallback configuration for category indexing operations. */ public CategoryIndexConfiguration setUnspecified(CategoryIndexConfigurationEntry unspecified) { this.unspecified = unspecified; return this; } + /** Scope-specific configuration entries mapped by CategoryScope enum values. Allows different indexing configurations for different category relationship scopes (e.g., ImmediateParent, ImmediateParentOrItsParent, Ancestor). When null, only the Unspecified configuration will be used. */ + public CategoryIndexConfiguration addToByScope(CategoryScope key, CategoryIndexConfigurationEntry value) + { + if (this.byScope == null) + { + this.byScope = new HashMap<>(); + } + this.byScope.put(key, value); + return this; + } + /** Scope-specific configuration entries mapped by CategoryScope enum values. Allows different indexing configurations for different category relationship scopes (e.g., ImmediateParent, ImmediateParentOrItsParent, Ancestor). When null, only the Unspecified configuration will be used. */ + public CategoryIndexConfiguration setByScope(@Nullable HashMap byScope) + { + this.byScope = byScope; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/DisplayAdPromotionSpecification.java b/src/src/main/java/com/relewise/client/model/DisplayAdPromotionSpecification.java deleted file mode 100644 index 5872eab..0000000 --- a/src/src/main/java/com/relewise/client/model/DisplayAdPromotionSpecification.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.relewise.client.model; - -import com.fasterxml.jackson.annotation.*; -import javax.annotation.Nullable; -import java.io.IOException; -import java.time.Duration; -import java.time.OffsetDateTime; -import java.time.LocalDateTime; -import java.util.Objects; -import java.util.Arrays; -import java.util.UUID; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Set; -import java.util.HashSet; - -/** Used for specifying that this kind of promotion is allowed at a specific Location as well as for specific advertisers */ -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.EXISTING_PROPERTY, - property = "$type", - defaultImpl = DisplayAdPromotionSpecification.class) -@JsonIgnoreProperties(ignoreUnknown = true) -public class DisplayAdPromotionSpecification extends PromotionSpecification -{ - public String $type = "Relewise.Client.DataTypes.RetailMedia.DisplayAdPromotion+Specification, Relewise.Client"; - /** The DisplayAdTemplate Ids that are valid to promote */ - public @Nullable UUID[] promotableDisplayAdTemplateIds; - /** The DisplayAdTemplates found via filters that are valid to promote */ - public @Nullable FilterCollection promotableDisplayAdTemplateFilters; - public static DisplayAdPromotionSpecification create(@Nullable UUID[] promotableDisplayAdTemplateIds, @Nullable FilterCollection promotableDisplayAdTemplateFilters) - { - return new DisplayAdPromotionSpecification(promotableDisplayAdTemplateIds, promotableDisplayAdTemplateFilters); - } - public DisplayAdPromotionSpecification(@Nullable UUID[] promotableDisplayAdTemplateIds, @Nullable FilterCollection promotableDisplayAdTemplateFilters) - { - this.promotableDisplayAdTemplateIds = promotableDisplayAdTemplateIds; - this.promotableDisplayAdTemplateFilters = promotableDisplayAdTemplateFilters; - } - public DisplayAdPromotionSpecification() - { - } - /** The DisplayAdTemplate Ids that are valid to promote */ - public @Nullable UUID[] getPromotableDisplayAdTemplateIds() - { - return this.promotableDisplayAdTemplateIds; - } - /** The DisplayAdTemplates found via filters that are valid to promote */ - public @Nullable FilterCollection getPromotableDisplayAdTemplateFilters() - { - return this.promotableDisplayAdTemplateFilters; - } - /** The DisplayAdTemplate Ids that are valid to promote */ - public DisplayAdPromotionSpecification setPromotableDisplayAdTemplateIds(UUID... promotableDisplayAdTemplateIds) - { - this.promotableDisplayAdTemplateIds = promotableDisplayAdTemplateIds; - return this; - } - /** The DisplayAdTemplate Ids that are valid to promote */ - public DisplayAdPromotionSpecification addToPromotableDisplayAdTemplateIds(UUID promotableDisplayAdTemplateId) - { - if (this.promotableDisplayAdTemplateIds == null) - { - this.promotableDisplayAdTemplateIds = new UUID[] { promotableDisplayAdTemplateId }; - } - else - { - ArrayList existingList = new ArrayList<>(Arrays.asList(this.promotableDisplayAdTemplateIds)); - existingList.add(promotableDisplayAdTemplateId); - this.promotableDisplayAdTemplateIds = existingList.toArray(new UUID[0]); - } - return this; - } - /** The DisplayAdTemplates found via filters that are valid to promote */ - public DisplayAdPromotionSpecification setPromotableDisplayAdTemplateFilters(@Nullable FilterCollection promotableDisplayAdTemplateFilters) - { - this.promotableDisplayAdTemplateFilters = promotableDisplayAdTemplateFilters; - return this; - } -} diff --git a/src/src/main/java/com/relewise/client/model/Location.java b/src/src/main/java/com/relewise/client/model/Location.java index 0b886b7..adf34cb 100644 --- a/src/src/main/java/com/relewise/client/model/Location.java +++ b/src/src/main/java/com/relewise/client/model/Location.java @@ -31,19 +31,16 @@ public class Location extends LocationEntityStateUUIDLocationMetadataValuesRetai public @Nullable String key; /** The placements where promotions may be displayed at this location If null or empty, no promotions will be shown at this location */ public @Nullable LocationPlacementCollection placements; - /** Defines what kinds of promotions are supported by this location */ - public @Nullable PromotionSpecificationCollection supportedPromotions; - public static Location create(@Nullable UUID id, LocationEntityState state, String name, LocationPlacementCollection placements, @Nullable PromotionSpecificationCollection supportedPromotions) + public static Location create(@Nullable UUID id, LocationEntityState state, String name, LocationPlacementCollection placements) { - return new Location(id, state, name, placements, supportedPromotions); + return new Location(id, state, name, placements); } - public Location(@Nullable UUID id, LocationEntityState state, String name, LocationPlacementCollection placements, @Nullable PromotionSpecificationCollection supportedPromotions) + public Location(@Nullable UUID id, LocationEntityState state, String name, LocationPlacementCollection placements) { this.id = id; this.state = state; this.name = name; this.placements = placements; - this.supportedPromotions = supportedPromotions; } public static Location create(@Nullable UUID id, LocationEntityState state, String name) { @@ -73,11 +70,6 @@ public String getName() { return this.placements; } - /** Defines what kinds of promotions are supported by this location */ - public @Nullable PromotionSpecificationCollection getSupportedPromotions() - { - return this.supportedPromotions; - } /** The name of this location, e.g. "Front page", "PDP", "Home screen" etc. */ public Location setName(String name) { @@ -96,12 +88,6 @@ public Location setPlacements(@Nullable LocationPlacementCollection placements) this.placements = placements; return this; } - /** Defines what kinds of promotions are supported by this location */ - public Location setSupportedPromotions(@Nullable PromotionSpecificationCollection supportedPromotions) - { - this.supportedPromotions = supportedPromotions; - return this; - } @Override public Location setState(LocationEntityState state) { diff --git a/src/src/main/java/com/relewise/client/model/ProductCategoryIndexConfiguration.java b/src/src/main/java/com/relewise/client/model/ProductCategoryIndexConfiguration.java index de3d665..dfff181 100644 --- a/src/src/main/java/com/relewise/client/model/ProductCategoryIndexConfiguration.java +++ b/src/src/main/java/com/relewise/client/model/ProductCategoryIndexConfiguration.java @@ -37,4 +37,19 @@ public ProductCategoryIndexConfiguration setUnspecified(CategoryIndexConfigurati this.unspecified = unspecified; return this; } + public ProductCategoryIndexConfiguration addToByScope(CategoryScope key, CategoryIndexConfigurationEntry value) + { + if (this.byScope == null) + { + this.byScope = new HashMap<>(); + } + this.byScope.put(key, value); + return this; + } + @Override + public ProductCategoryIndexConfiguration setByScope(@Nullable HashMap byScope) + { + this.byScope = byScope; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/PromotionSpecification.java b/src/src/main/java/com/relewise/client/model/PromotionSpecification.java index 06506ba..fe6e86a 100644 --- a/src/src/main/java/com/relewise/client/model/PromotionSpecification.java +++ b/src/src/main/java/com/relewise/client/model/PromotionSpecification.java @@ -21,7 +21,6 @@ property = "$type") @JsonSubTypes({ @JsonSubTypes.Type(value = ProductPromotionSpecification.class, name = "Relewise.Client.DataTypes.RetailMedia.ProductPromotion+Specification, Relewise.Client"), - @JsonSubTypes.Type(value = DisplayAdPromotionSpecification.class, name = "Relewise.Client.DataTypes.RetailMedia.DisplayAdPromotion+Specification, Relewise.Client"), }) @JsonIgnoreProperties(ignoreUnknown = true) public abstract class PromotionSpecification diff --git a/src/src/main/java/com/relewise/client/model/PromotionSpecificationCollection.java b/src/src/main/java/com/relewise/client/model/PromotionSpecificationCollection.java index f29c5ff..6b18efb 100644 --- a/src/src/main/java/com/relewise/client/model/PromotionSpecificationCollection.java +++ b/src/src/main/java/com/relewise/client/model/PromotionSpecificationCollection.java @@ -19,7 +19,6 @@ public class PromotionSpecificationCollection { public @Nullable ProductPromotionSpecification productPromotion; - public @Nullable DisplayAdPromotionSpecification displayAdPromotion; public static PromotionSpecificationCollection create() { return new PromotionSpecificationCollection(); @@ -31,18 +30,9 @@ public PromotionSpecificationCollection() { return this.productPromotion; } - public @Nullable DisplayAdPromotionSpecification getDisplayAdPromotion() - { - return this.displayAdPromotion; - } public PromotionSpecificationCollection setProductPromotion(@Nullable ProductPromotionSpecification productPromotion) { this.productPromotion = productPromotion; return this; } - public PromotionSpecificationCollection setDisplayAdPromotion(@Nullable DisplayAdPromotionSpecification displayAdPromotion) - { - this.displayAdPromotion = displayAdPromotion; - return this; - } } diff --git a/src/src/main/java/com/relewise/client/model/RequestContextFilter.java b/src/src/main/java/com/relewise/client/model/RequestContextFilter.java index facc10f..3c56f1c 100644 --- a/src/src/main/java/com/relewise/client/model/RequestContextFilter.java +++ b/src/src/main/java/com/relewise/client/model/RequestContextFilter.java @@ -24,7 +24,9 @@ public class RequestContextFilter public ArrayList languages; public ArrayList currencies; public RequestFilterCriteria filters; + /** @deprecated Use SearchTermCriteria instead */ public @Nullable SearchTermConditionByLanguageCollection searchTerms; + public @Nullable SearchTermCriteria searchTermCriteria; public static RequestContextFilter create() { return new RequestContextFilter(); @@ -56,10 +58,15 @@ public RequestFilterCriteria getFilters() { return this.filters; } + /** @deprecated Use SearchTermCriteria instead */ public @Nullable SearchTermConditionByLanguageCollection getSearchTerms() { return this.searchTerms; } + public @Nullable SearchTermCriteria getSearchTermCriteria() + { + return this.searchTermCriteria; + } public RequestContextFilter setRecommendations(RecommendationTypeCollection recommendations) { this.recommendations = recommendations; @@ -117,9 +124,15 @@ public RequestContextFilter setFilters(RequestFilterCriteria filters) this.filters = filters; return this; } + /** @deprecated Use SearchTermCriteria instead */ public RequestContextFilter setSearchTerms(@Nullable SearchTermConditionByLanguageCollection searchTerms) { this.searchTerms = searchTerms; return this; } + public RequestContextFilter setSearchTermCriteria(@Nullable SearchTermCriteria searchTermCriteria) + { + this.searchTermCriteria = searchTermCriteria; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/RetailMediaResultPlacementResultEntityDisplayAd.java b/src/src/main/java/com/relewise/client/model/RetailMediaResultPlacementResultEntityDisplayAd.java index 5cb3290..0320ab1 100644 --- a/src/src/main/java/com/relewise/client/model/RetailMediaResultPlacementResultEntityDisplayAd.java +++ b/src/src/main/java/com/relewise/client/model/RetailMediaResultPlacementResultEntityDisplayAd.java @@ -19,6 +19,7 @@ public class RetailMediaResultPlacementResultEntityDisplayAd { public DisplayAdResult result; + public UUID campaignId; public static RetailMediaResultPlacementResultEntityDisplayAd create() { return new RetailMediaResultPlacementResultEntityDisplayAd(); @@ -30,9 +31,18 @@ public DisplayAdResult getResult() { return this.result; } + public UUID getCampaignId() + { + return this.campaignId; + } public RetailMediaResultPlacementResultEntityDisplayAd setResult(DisplayAdResult result) { this.result = result; return this; } + public RetailMediaResultPlacementResultEntityDisplayAd setCampaignId(UUID campaignId) + { + this.campaignId = campaignId; + return this; + } } diff --git a/src/src/main/java/com/relewise/client/model/SearchTermCriteria.java b/src/src/main/java/com/relewise/client/model/SearchTermCriteria.java new file mode 100644 index 0000000..abeea83 --- /dev/null +++ b/src/src/main/java/com/relewise/client/model/SearchTermCriteria.java @@ -0,0 +1,48 @@ +package com.relewise.client.model; + +import com.fasterxml.jackson.annotation.*; +import javax.annotation.Nullable; +import java.io.IOException; +import java.time.Duration; +import java.time.OffsetDateTime; +import java.time.LocalDateTime; +import java.util.Objects; +import java.util.Arrays; +import java.util.UUID; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class SearchTermCriteria +{ + public @Nullable SearchTermCriteriaSearchTermPolicy policy; + public @Nullable SearchTermConditionByLanguageCollection termCriteria; + public static SearchTermCriteria create() + { + return new SearchTermCriteria(); + } + public SearchTermCriteria() + { + } + public @Nullable SearchTermCriteriaSearchTermPolicy getPolicy() + { + return this.policy; + } + public @Nullable SearchTermConditionByLanguageCollection getTermCriteria() + { + return this.termCriteria; + } + public SearchTermCriteria setPolicy(@Nullable SearchTermCriteriaSearchTermPolicy policy) + { + this.policy = policy; + return this; + } + public SearchTermCriteria setTermCriteria(@Nullable SearchTermConditionByLanguageCollection termCriteria) + { + this.termCriteria = termCriteria; + return this; + } +} diff --git a/src/src/main/java/com/relewise/client/model/SearchTermCriteriaSearchTermPolicy.java b/src/src/main/java/com/relewise/client/model/SearchTermCriteriaSearchTermPolicy.java new file mode 100644 index 0000000..0a15313 --- /dev/null +++ b/src/src/main/java/com/relewise/client/model/SearchTermCriteriaSearchTermPolicy.java @@ -0,0 +1,30 @@ +package com.relewise.client.model; + +import com.fasterxml.jackson.annotation.*; +import javax.annotation.Nullable; +import java.io.IOException; +import java.time.Duration; +import java.time.OffsetDateTime; +import java.time.LocalDateTime; +import java.util.Objects; +import java.util.Arrays; +import java.util.UUID; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +public enum SearchTermCriteriaSearchTermPolicy +{ + MustHaveSearchTerm { + public String toString() { + return "MustHaveSearchTerm"; + } + }, + MustNotHaveSearchTerm { + public String toString() { + return "MustNotHaveSearchTerm"; + } + }, +}