diff --git a/Generator/JavaMemberWriters/JavaCreatorMethodWriter.cs b/Generator/JavaMemberWriters/JavaCreatorMethodWriter.cs index c61857f..93e73c0 100644 --- a/Generator/JavaMemberWriters/JavaCreatorMethodWriter.cs +++ b/Generator/JavaMemberWriters/JavaCreatorMethodWriter.cs @@ -33,7 +33,7 @@ public void Write(IndentedTextWriter writer, Type type, string typeName, (Proper && c.GetParameters().Length == propertyInformations.Length // There are as many parameters as there are properties. && c.GetParameters() .All(parameter => propertyInformations - .Any(property => ParameterIsPersuadableIntoPropertyType(property.info, parameter)) + .Any(property => ParameterHasSameNullabilityAsProperty(property.info, parameter)) ) // There is a property type that matches each parameter type. ); @@ -45,7 +45,14 @@ public void Write(IndentedTextWriter writer, Type type, string typeName, (Proper && ParameterIsPersuadableIntoPropertyType(property.info, parameter)) == 1 ) // There is exactly 1 property type that matches each parameter type and name ) - .MaxBy(c => c.GetParameters().Length); // We take the largest constructor to be more deterministic. + .Where(c => c.GetParameters().Length > 0) + .ToArray(); + + var largestCoveringTypeAndNameMappableConstructorParameters = coveringTypeAndNameMappableConstructorParameters + .MaxBy(c => c.GetParameters().Length); + + var smallestCoveringTypeAndNameMappableConstructorParameters = coveringTypeAndNameMappableConstructorParameters + .MinBy(c => c.GetParameters().Length); var allConstructorParametersIntersectionWithMappableNamesAndTypes = type .GetConstructors() @@ -62,14 +69,27 @@ public void Write(IndentedTextWriter writer, Type type, string typeName, (Proper WriteConstructor(writer, type, typeName, propertyInformations, coveringUniqueTypeMappableConstructorParameters, defaultParameters); } } - else if (coveringTypeAndNameMappableConstructorParameters != null) + else if (largestCoveringTypeAndNameMappableConstructorParameters != null || smallestCoveringTypeAndNameMappableConstructorParameters != null) { - string[] defaultParameters = coveringTypeAndNameMappableConstructorParameters.GetParameters().Where(parameter => parameter.HasDefaultValue).Select(parameter => parameter.Name).ToArray()!; + if (largestCoveringTypeAndNameMappableConstructorParameters != null) + { + string[] defaultParameters = largestCoveringTypeAndNameMappableConstructorParameters.GetParameters().Where(parameter => parameter.HasDefaultValue).Select(parameter => parameter.Name).ToArray()!; - WriteConstructor(writer, type, typeName, propertyInformations, coveringTypeAndNameMappableConstructorParameters, Array.Empty()); - if (defaultParameters.Any()) + WriteConstructor(writer, type, typeName, propertyInformations, largestCoveringTypeAndNameMappableConstructorParameters, Array.Empty()); + if (defaultParameters.Any()) + { + WriteConstructor(writer, type, typeName, propertyInformations, largestCoveringTypeAndNameMappableConstructorParameters, defaultParameters); + } + } + if (smallestCoveringTypeAndNameMappableConstructorParameters != null) { - WriteConstructor(writer, type, typeName, propertyInformations, coveringTypeAndNameMappableConstructorParameters, defaultParameters); + string[] defaultParameters = smallestCoveringTypeAndNameMappableConstructorParameters.GetParameters().Where(parameter => parameter.HasDefaultValue).Select(parameter => parameter.Name).ToArray()!; + + WriteConstructor(writer, type, typeName, propertyInformations, smallestCoveringTypeAndNameMappableConstructorParameters, Array.Empty()); + if (defaultParameters.Any()) + { + WriteConstructor(writer, type, typeName, propertyInformations, smallestCoveringTypeAndNameMappableConstructorParameters, defaultParameters); + } } } else if (allConstructorParametersIntersectionWithMappableNamesAndTypes != null) @@ -291,6 +311,30 @@ private static bool ParameterIsPersuadableIntoPropertyType(PropertyInfo property return false; } + private static bool ParameterHasSameNullabilityAsProperty(PropertyInfo property, ParameterInfo parameter) + { + if (EqualCollectionElementType(property.PropertyType, parameter.ParameterType)) + { + return true; + } + + Type propertyType = property.PropertyType.IsConstructedGenericType && property.PropertyType.GetGenericTypeDefinition() == typeof(Nullable<>) ? property.PropertyType.GetGenericArguments()[0] : property.PropertyType; + Type parameterType = parameter.ParameterType.IsConstructedGenericType && parameter.ParameterType.GetGenericTypeDefinition() == typeof(Nullable<>) ? parameter.ParameterType.GetGenericArguments()[0] : parameter.ParameterType; + + var propertyNullabilityContext = new NullabilityInfoContext().Create(property); + var parameterNullabilityContext = new NullabilityInfoContext().Create(parameter); + + bool propertyIsNullable = property.PropertyType != propertyType || propertyNullabilityContext.WriteState is NullabilityState.Nullable; + bool parameterIsNullable = parameter.ParameterType != parameterType || parameterNullabilityContext.WriteState is NullabilityState.Nullable; + + if (propertyType != parameterType) + { + return false; + } + + return parameterIsNullable == propertyIsNullable; + } + private static bool ContainedWithinEitherOne(string? first, string? second) { if (first is null || second is null) diff --git a/Generator/JavaTypeWriters/JavaClassWriter.cs b/Generator/JavaTypeWriters/JavaClassWriter.cs index ada1042..c9c111b 100644 --- a/Generator/JavaTypeWriters/JavaClassWriter.cs +++ b/Generator/JavaTypeWriters/JavaClassWriter.cs @@ -106,7 +106,7 @@ public void Write(IndentedTextWriter writer, Type type, string typeName) javaWriter.SettablePropertiesWriter.Write(writer, ownedProperties); javaWriter.StaticReadonlyPropertiesWriter.Write(writer, type, staticGetterProperties); - javaWriter.CreatorMethodWriter.Write(writer, type, typeName, ownedProperties); + javaWriter.CreatorMethodWriter.Write(writer, type, typeName, settableProperties); javaWriter.PropertyGetterMethodsWriter.Write(writer, ownedProperties); javaWriter.PropertySetterMethodsWriter.Write(writer, type, typeName, settableProperties, ownedProperties.Select(p => p.propertyName).ToArray()); diff --git a/src/src/main/java/com/relewise/client/model/BrandDataFilter.java b/src/src/main/java/com/relewise/client/model/BrandDataFilter.java index f4954a8..82481bd 100644 --- a/src/src/main/java/com/relewise/client/model/BrandDataFilter.java +++ b/src/src/main/java/com/relewise/client/model/BrandDataFilter.java @@ -28,6 +28,34 @@ public class BrandDataFilter extends DataFilter implements IBrandFilter { public String $type = "Relewise.Client.Requests.Filters.BrandDataFilter, Relewise.Client"; + public static BrandDataFilter create(String key, String... objectPath) + { + return new BrandDataFilter(key, objectPath); + } + public BrandDataFilter(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = null; + this.mustMatchAllConditions = true; + this.filterOutIfKeyIsNotFound = true; + this.language = null; + this.currency = null; + } + public static BrandDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + return new BrandDataFilter(key, objectPath, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); + } + public BrandDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; + this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; + this.language = language; + this.currency = currency; + } public static BrandDataFilter create(String key) { return new BrandDataFilter(key); @@ -35,17 +63,21 @@ public static BrandDataFilter create(String key) public BrandDataFilter(String key) { this.key = key; + this.conditions = null; + this.mustMatchAllConditions = true; this.filterOutIfKeyIsNotFound = true; this.language = null; this.currency = null; } - public static BrandDataFilter create(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public static BrandDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { - return new BrandDataFilter(key, filterOutIfKeyIsNotFound, language, currency); + return new BrandDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); } - public BrandDataFilter(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public BrandDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { this.key = key; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; this.language = language; this.currency = currency; diff --git a/src/src/main/java/com/relewise/client/model/ContainsCondition.java b/src/src/main/java/com/relewise/client/model/ContainsCondition.java index ca5cec8..44a49a0 100644 --- a/src/src/main/java/com/relewise/client/model/ContainsCondition.java +++ b/src/src/main/java/com/relewise/client/model/ContainsCondition.java @@ -31,6 +31,26 @@ public class ContainsCondition extends ValueCondition public @Nullable DataValue value; public ContainsConditionCollectionArgumentEvaluationMode valueCollectionEvaluationMode; public @Nullable DataObjectFilter objectFilter; + public static ContainsCondition create(DataValue value, ContainsConditionCollectionArgumentEvaluationMode valueCollectionEvaluationMode) + { + return new ContainsCondition(value, valueCollectionEvaluationMode); + } + public ContainsCondition(DataValue value, ContainsConditionCollectionArgumentEvaluationMode valueCollectionEvaluationMode) + { + this.value = value; + this.valueCollectionEvaluationMode = valueCollectionEvaluationMode; + this.negated = false; + } + public static ContainsCondition create(DataValue value, ContainsConditionCollectionArgumentEvaluationMode valueCollectionEvaluationMode, Boolean negated) + { + return new ContainsCondition(value, valueCollectionEvaluationMode, negated); + } + public ContainsCondition(DataValue value, ContainsConditionCollectionArgumentEvaluationMode valueCollectionEvaluationMode, Boolean negated) + { + this.value = value; + this.valueCollectionEvaluationMode = valueCollectionEvaluationMode; + this.negated = negated; + } public static ContainsCondition create(DataValue value) { return new ContainsCondition(value); diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java b/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java index 1efa224..3418ca0 100644 --- a/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java +++ b/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java @@ -28,6 +28,34 @@ public class ContentCategoryDataFilter extends DataFilter implements ICategoryFilter { public String $type = "Relewise.Client.Requests.Filters.ContentCategoryDataFilter, Relewise.Client"; + public static ContentCategoryDataFilter create(String key, String... objectPath) + { + return new ContentCategoryDataFilter(key, objectPath); + } + public ContentCategoryDataFilter(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = null; + this.mustMatchAllConditions = true; + this.filterOutIfKeyIsNotFound = true; + this.language = null; + this.currency = null; + } + public static ContentCategoryDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + return new ContentCategoryDataFilter(key, objectPath, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); + } + public ContentCategoryDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; + this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; + this.language = language; + this.currency = currency; + } public static ContentCategoryDataFilter create(String key) { return new ContentCategoryDataFilter(key); @@ -35,17 +63,21 @@ public static ContentCategoryDataFilter create(String key) public ContentCategoryDataFilter(String key) { this.key = key; + this.conditions = null; + this.mustMatchAllConditions = true; this.filterOutIfKeyIsNotFound = true; this.language = null; this.currency = null; } - public static ContentCategoryDataFilter create(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public static ContentCategoryDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { - return new ContentCategoryDataFilter(key, filterOutIfKeyIsNotFound, language, currency); + return new ContentCategoryDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); } - public ContentCategoryDataFilter(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public ContentCategoryDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { this.key = key; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; this.language = language; this.currency = currency; diff --git a/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java b/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java index 8b31be1..40fe41e 100644 --- a/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java +++ b/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java @@ -30,6 +30,21 @@ public class ContentCategorySearchRequest extends PaginatedSearchRequest impleme public String $type = "Relewise.Client.Requests.Search.ContentCategorySearchRequest, Relewise.Client"; public String term; public @Nullable ContentCategorySearchSettings settings; + public static ContentCategorySearchRequest create(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, String term, Integer skip, Integer take) + { + return new ContentCategorySearchRequest(language, currency, indexSelector, user, displayedAtLocation, term, skip, take); + } + public ContentCategorySearchRequest(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, String term, Integer skip, Integer take) + { + this.language = language; + this.currency = currency; + this.indexSelector = indexSelector; + this.user = user; + this.displayedAtLocation = displayedAtLocation; + this.term = term; + this.skip = skip; + this.take = take; + } public static ContentCategorySearchRequest create(@Nullable Language language, @Nullable Currency currency, User user, String displayedAtLocation, String term, Integer skip, Integer take) { return new ContentCategorySearchRequest(language, currency, user, displayedAtLocation, term, skip, take); diff --git a/src/src/main/java/com/relewise/client/model/ContentDataFilter.java b/src/src/main/java/com/relewise/client/model/ContentDataFilter.java index 458ba56..f530491 100644 --- a/src/src/main/java/com/relewise/client/model/ContentDataFilter.java +++ b/src/src/main/java/com/relewise/client/model/ContentDataFilter.java @@ -28,6 +28,34 @@ public class ContentDataFilter extends DataFilter implements IContentFilter { public String $type = "Relewise.Client.Requests.Filters.ContentDataFilter, Relewise.Client"; + public static ContentDataFilter create(String key, String... objectPath) + { + return new ContentDataFilter(key, objectPath); + } + public ContentDataFilter(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = null; + this.mustMatchAllConditions = true; + this.filterOutIfKeyIsNotFound = true; + this.language = null; + this.currency = null; + } + public static ContentDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + return new ContentDataFilter(key, objectPath, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); + } + public ContentDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; + this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; + this.language = language; + this.currency = currency; + } public static ContentDataFilter create(String key) { return new ContentDataFilter(key); @@ -35,17 +63,21 @@ public static ContentDataFilter create(String key) public ContentDataFilter(String key) { this.key = key; + this.conditions = null; + this.mustMatchAllConditions = true; this.filterOutIfKeyIsNotFound = true; this.language = null; this.currency = null; } - public static ContentDataFilter create(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public static ContentDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { - return new ContentDataFilter(key, filterOutIfKeyIsNotFound, language, currency); + return new ContentDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); } - public ContentDataFilter(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public ContentDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { this.key = key; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; this.language = language; this.currency = currency; diff --git a/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java b/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java index 019ca19..b730a37 100644 --- a/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java +++ b/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java @@ -32,6 +32,21 @@ public class ContentSearchRequest extends PaginatedSearchRequest implements IUse public @Nullable ContentFacetQuery facets; public @Nullable ContentSearchSettings settings; public @Nullable ContentSortBySpecification sorting; + public static ContentSearchRequest create(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) + { + return new ContentSearchRequest(language, currency, indexSelector, user, displayedAtLocation, term, skip, take); + } + public ContentSearchRequest(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) + { + this.language = language; + this.currency = currency; + this.indexSelector = indexSelector; + this.user = user; + this.displayedAtLocation = displayedAtLocation; + this.term = term; + this.skip = skip; + this.take = take; + } public static ContentSearchRequest create(@Nullable Language language, @Nullable Currency currency, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) { return new ContentSearchRequest(language, currency, user, displayedAtLocation, term, skip, take); diff --git a/src/src/main/java/com/relewise/client/model/DataObjectValueSelector.java b/src/src/main/java/com/relewise/client/model/DataObjectValueSelector.java index e092448..00e5edb 100644 --- a/src/src/main/java/com/relewise/client/model/DataObjectValueSelector.java +++ b/src/src/main/java/com/relewise/client/model/DataObjectValueSelector.java @@ -36,6 +36,14 @@ public DataObjectValueSelector(String key, @Nullable DataObjectFilter filter, Da this.filter = filter; this.childSelector = childSelector; } + public static DataObjectValueSelector create(String key) + { + return new DataObjectValueSelector(key); + } + public DataObjectValueSelector(String key) + { + this.key = key; + } public DataObjectValueSelector() { } diff --git a/src/src/main/java/com/relewise/client/model/DeleteDecompoundRulesRequest.java b/src/src/main/java/com/relewise/client/model/DeleteDecompoundRulesRequest.java index 582f0a5..a747eae 100644 --- a/src/src/main/java/com/relewise/client/model/DeleteDecompoundRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/DeleteDecompoundRulesRequest.java @@ -28,12 +28,13 @@ public class DeleteDecompoundRulesRequest extends DeleteSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.DeleteDecompoundRulesRequest, Relewise.Client"; - public static DeleteDecompoundRulesRequest create(String deletedBy) + public static DeleteDecompoundRulesRequest create(UUID[] ids, String deletedBy) { - return new DeleteDecompoundRulesRequest(deletedBy); + return new DeleteDecompoundRulesRequest(ids, deletedBy); } - public DeleteDecompoundRulesRequest(String deletedBy) + public DeleteDecompoundRulesRequest(UUID[] ids, String deletedBy) { + this.ids = ids; this.deletedBy = deletedBy; } public DeleteDecompoundRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/DeletePredictionRulesRequest.java b/src/src/main/java/com/relewise/client/model/DeletePredictionRulesRequest.java index 2417ff6..251398b 100644 --- a/src/src/main/java/com/relewise/client/model/DeletePredictionRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/DeletePredictionRulesRequest.java @@ -28,12 +28,13 @@ public class DeletePredictionRulesRequest extends DeleteSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.DeletePredictionRulesRequest, Relewise.Client"; - public static DeletePredictionRulesRequest create(String deletedBy) + public static DeletePredictionRulesRequest create(UUID[] ids, String deletedBy) { - return new DeletePredictionRulesRequest(deletedBy); + return new DeletePredictionRulesRequest(ids, deletedBy); } - public DeletePredictionRulesRequest(String deletedBy) + public DeletePredictionRulesRequest(UUID[] ids, String deletedBy) { + this.ids = ids; this.deletedBy = deletedBy; } public DeletePredictionRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/DeleteRedirectRulesRequest.java b/src/src/main/java/com/relewise/client/model/DeleteRedirectRulesRequest.java index 2c643ee..7e81ddc 100644 --- a/src/src/main/java/com/relewise/client/model/DeleteRedirectRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/DeleteRedirectRulesRequest.java @@ -28,12 +28,13 @@ public class DeleteRedirectRulesRequest extends DeleteSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.DeleteRedirectRulesRequest, Relewise.Client"; - public static DeleteRedirectRulesRequest create(String deletedBy) + public static DeleteRedirectRulesRequest create(UUID[] ids, String deletedBy) { - return new DeleteRedirectRulesRequest(deletedBy); + return new DeleteRedirectRulesRequest(ids, deletedBy); } - public DeleteRedirectRulesRequest(String deletedBy) + public DeleteRedirectRulesRequest(UUID[] ids, String deletedBy) { + this.ids = ids; this.deletedBy = deletedBy; } public DeleteRedirectRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/DeleteStemmingRulesRequest.java b/src/src/main/java/com/relewise/client/model/DeleteStemmingRulesRequest.java index a72835c..3c51bb5 100644 --- a/src/src/main/java/com/relewise/client/model/DeleteStemmingRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/DeleteStemmingRulesRequest.java @@ -28,12 +28,13 @@ public class DeleteStemmingRulesRequest extends DeleteSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.DeleteStemmingRulesRequest, Relewise.Client"; - public static DeleteStemmingRulesRequest create(String deletedBy) + public static DeleteStemmingRulesRequest create(UUID[] ids, String deletedBy) { - return new DeleteStemmingRulesRequest(deletedBy); + return new DeleteStemmingRulesRequest(ids, deletedBy); } - public DeleteStemmingRulesRequest(String deletedBy) + public DeleteStemmingRulesRequest(UUID[] ids, String deletedBy) { + this.ids = ids; this.deletedBy = deletedBy; } public DeleteStemmingRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/FieldIndexConfiguration.java b/src/src/main/java/com/relewise/client/model/FieldIndexConfiguration.java index a5b1d35..3c97164 100644 --- a/src/src/main/java/com/relewise/client/model/FieldIndexConfiguration.java +++ b/src/src/main/java/com/relewise/client/model/FieldIndexConfiguration.java @@ -37,6 +37,16 @@ public FieldIndexConfiguration(Boolean included, Short weight, PredictionSourceT this.predictionSourceType = predictionSourceType; this.parser = parser; } + public static FieldIndexConfiguration create(Boolean included, Short weight, PredictionSourceType predictionSourceType) + { + return new FieldIndexConfiguration(included, weight, predictionSourceType); + } + public FieldIndexConfiguration(Boolean included, Short weight, PredictionSourceType predictionSourceType) + { + this.included = included; + this.weight = weight; + this.predictionSourceType = predictionSourceType; + } public FieldIndexConfiguration() { } diff --git a/src/src/main/java/com/relewise/client/model/HasActivityCondition.java b/src/src/main/java/com/relewise/client/model/HasActivityCondition.java index 3662ba9..fdea015 100644 --- a/src/src/main/java/com/relewise/client/model/HasActivityCondition.java +++ b/src/src/main/java/com/relewise/client/model/HasActivityCondition.java @@ -30,12 +30,23 @@ public class HasActivityCondition extends UserCondition public String $type = "Relewise.Client.DataTypes.UserConditions.HasActivityCondition, Relewise.Client"; public Integer withinMinutes; public Integer forAtLeastSeconds; - public static HasActivityCondition create(Boolean negated) + public static HasActivityCondition create(Integer withinMinutes, Integer forAtLeastSeconds, Boolean negated) { - return new HasActivityCondition(negated); + return new HasActivityCondition(withinMinutes, forAtLeastSeconds, negated); } - public HasActivityCondition(Boolean negated) + public HasActivityCondition(Integer withinMinutes, Integer forAtLeastSeconds, Boolean negated) { + this.withinMinutes = withinMinutes; + this.forAtLeastSeconds = forAtLeastSeconds; + this.negated = negated; + } + public static HasActivityCondition create(Integer withinMinutes, Boolean negated) + { + return new HasActivityCondition(withinMinutes, negated); + } + public HasActivityCondition(Integer withinMinutes, Boolean negated) + { + this.withinMinutes = withinMinutes; this.negated = negated; } public HasActivityCondition() diff --git a/src/src/main/java/com/relewise/client/model/HasClassificationCondition.java b/src/src/main/java/com/relewise/client/model/HasClassificationCondition.java index 915ed8d..2cce8cc 100644 --- a/src/src/main/java/com/relewise/client/model/HasClassificationCondition.java +++ b/src/src/main/java/com/relewise/client/model/HasClassificationCondition.java @@ -30,6 +30,16 @@ public class HasClassificationCondition extends UserCondition public String $type = "Relewise.Client.DataTypes.UserConditions.HasClassificationCondition, Relewise.Client"; public String key; public String value; + public static HasClassificationCondition create(String key, String value, Boolean negated) + { + return new HasClassificationCondition(key, value, negated); + } + public HasClassificationCondition(String key, String value, Boolean negated) + { + this.key = key; + this.value = value; + this.negated = negated; + } public static HasClassificationCondition create(String key, Boolean negated) { return new HasClassificationCondition(key, negated); diff --git a/src/src/main/java/com/relewise/client/model/HasModifiedCartCondition.java b/src/src/main/java/com/relewise/client/model/HasModifiedCartCondition.java index 2cb4515..5a2de60 100644 --- a/src/src/main/java/com/relewise/client/model/HasModifiedCartCondition.java +++ b/src/src/main/java/com/relewise/client/model/HasModifiedCartCondition.java @@ -30,24 +30,31 @@ public class HasModifiedCartCondition extends UserCondition public String $type = "Relewise.Client.DataTypes.UserConditions.HasModifiedCartCondition, Relewise.Client"; public Integer withinMinutes; public String cartName; - public static HasModifiedCartCondition create() + public static HasModifiedCartCondition create(Integer withinMinutes) { - return new HasModifiedCartCondition(); + return new HasModifiedCartCondition(withinMinutes); } - public HasModifiedCartCondition() + public HasModifiedCartCondition(Integer withinMinutes) { + this.withinMinutes = withinMinutes; this.cartName = null; this.negated = false; } - public static HasModifiedCartCondition create(String cartName, Boolean negated) + public static HasModifiedCartCondition create(Integer withinMinutes, String cartName, Boolean negated) { - return new HasModifiedCartCondition(cartName, negated); + return new HasModifiedCartCondition(withinMinutes, cartName, negated); } - public HasModifiedCartCondition(String cartName, Boolean negated) + public HasModifiedCartCondition(Integer withinMinutes, String cartName, Boolean negated) { + this.withinMinutes = withinMinutes; this.cartName = cartName; this.negated = negated; } + public HasModifiedCartCondition() + { + this.cartName = null; + this.negated = false; + } public Integer getWithinMinutes() { return this.withinMinutes; diff --git a/src/src/main/java/com/relewise/client/model/HasPlacedOrderCondition.java b/src/src/main/java/com/relewise/client/model/HasPlacedOrderCondition.java index 39a0724..e4ddfbb 100644 --- a/src/src/main/java/com/relewise/client/model/HasPlacedOrderCondition.java +++ b/src/src/main/java/com/relewise/client/model/HasPlacedOrderCondition.java @@ -29,12 +29,13 @@ public class HasPlacedOrderCondition extends UserCondition { public String $type = "Relewise.Client.DataTypes.UserConditions.HasPlacedOrderCondition, Relewise.Client"; public Integer withinMinutes; - public static HasPlacedOrderCondition create(Boolean negated) + public static HasPlacedOrderCondition create(Integer withinMinutes, Boolean negated) { - return new HasPlacedOrderCondition(negated); + return new HasPlacedOrderCondition(withinMinutes, negated); } - public HasPlacedOrderCondition(Boolean negated) + public HasPlacedOrderCondition(Integer withinMinutes, Boolean negated) { + this.withinMinutes = withinMinutes; this.negated = negated; } public HasPlacedOrderCondition() diff --git a/src/src/main/java/com/relewise/client/model/HasRecentlyReceivedSameTriggerCondition.java b/src/src/main/java/com/relewise/client/model/HasRecentlyReceivedSameTriggerCondition.java index 79fd2eb..be215da 100644 --- a/src/src/main/java/com/relewise/client/model/HasRecentlyReceivedSameTriggerCondition.java +++ b/src/src/main/java/com/relewise/client/model/HasRecentlyReceivedSameTriggerCondition.java @@ -29,12 +29,13 @@ public class HasRecentlyReceivedSameTriggerCondition extends UserCondition { public String $type = "Relewise.Client.DataTypes.UserConditions.HasRecentlyReceivedSameTriggerCondition, Relewise.Client"; public Integer withinMinutes; - public static HasRecentlyReceivedSameTriggerCondition create(Boolean negated) + public static HasRecentlyReceivedSameTriggerCondition create(Integer withinMinutes, Boolean negated) { - return new HasRecentlyReceivedSameTriggerCondition(negated); + return new HasRecentlyReceivedSameTriggerCondition(withinMinutes, negated); } - public HasRecentlyReceivedSameTriggerCondition(Boolean negated) + public HasRecentlyReceivedSameTriggerCondition(Integer withinMinutes, Boolean negated) { + this.withinMinutes = withinMinutes; this.negated = negated; } public HasRecentlyReceivedSameTriggerCondition() diff --git a/src/src/main/java/com/relewise/client/model/MerchandisingRuleRequest.java b/src/src/main/java/com/relewise/client/model/MerchandisingRuleRequest.java index 6c9818d..08da7d1 100644 --- a/src/src/main/java/com/relewise/client/model/MerchandisingRuleRequest.java +++ b/src/src/main/java/com/relewise/client/model/MerchandisingRuleRequest.java @@ -39,6 +39,14 @@ public MerchandisingRuleRequest(UUID id, Short type) this.id = id; this.type = type; } + public static MerchandisingRuleRequest create(UUID id) + { + return new MerchandisingRuleRequest(id); + } + public MerchandisingRuleRequest(UUID id) + { + this.id = id; + } public MerchandisingRuleRequest() { } diff --git a/src/src/main/java/com/relewise/client/model/ObjectValueContainsCondition.java b/src/src/main/java/com/relewise/client/model/ObjectValueContainsCondition.java index 453fe25..bed1a45 100644 --- a/src/src/main/java/com/relewise/client/model/ObjectValueContainsCondition.java +++ b/src/src/main/java/com/relewise/client/model/ObjectValueContainsCondition.java @@ -30,6 +30,30 @@ public class ObjectValueContainsCondition extends ObjectValueCondition public String $type = "Relewise.Client.Requests.Filters.DataObjects.Conditions.ObjectValueContainsCondition, Relewise.Client"; public DataValue value; public ObjectValueContainsConditionCompareMode mode; + public static ObjectValueContainsCondition create(String key, String[] objectPath, DataValue value) + { + return new ObjectValueContainsCondition(key, objectPath, value); + } + public ObjectValueContainsCondition(String key, String[] objectPath, DataValue value) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.mode = ObjectValueContainsConditionCompareMode.All; + this.negated = false; + } + public static ObjectValueContainsCondition create(String key, String[] objectPath, DataValue value, ObjectValueContainsConditionCompareMode mode, Boolean negated) + { + return new ObjectValueContainsCondition(key, objectPath, value, mode, negated); + } + public ObjectValueContainsCondition(String key, String[] objectPath, DataValue value, ObjectValueContainsConditionCompareMode mode, Boolean negated) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.mode = mode; + this.negated = negated; + } public static ObjectValueContainsCondition create(String key, DataValue value) { return new ObjectValueContainsCondition(key, value); diff --git a/src/src/main/java/com/relewise/client/model/ObjectValueEqualsCondition.java b/src/src/main/java/com/relewise/client/model/ObjectValueEqualsCondition.java index 8a639d6..6d37274 100644 --- a/src/src/main/java/com/relewise/client/model/ObjectValueEqualsCondition.java +++ b/src/src/main/java/com/relewise/client/model/ObjectValueEqualsCondition.java @@ -29,6 +29,28 @@ public class ObjectValueEqualsCondition extends ObjectValueCondition { public String $type = "Relewise.Client.Requests.Filters.DataObjects.Conditions.ObjectValueEqualsCondition, Relewise.Client"; public DataValue value; + public static ObjectValueEqualsCondition create(String key, String[] objectPath, DataValue value) + { + return new ObjectValueEqualsCondition(key, objectPath, value); + } + public ObjectValueEqualsCondition(String key, String[] objectPath, DataValue value) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.negated = false; + } + public static ObjectValueEqualsCondition create(String key, String[] objectPath, DataValue value, Boolean negated) + { + return new ObjectValueEqualsCondition(key, objectPath, value, negated); + } + public ObjectValueEqualsCondition(String key, String[] objectPath, DataValue value, Boolean negated) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.negated = negated; + } public static ObjectValueEqualsCondition create(String key, DataValue value) { return new ObjectValueEqualsCondition(key, value); diff --git a/src/src/main/java/com/relewise/client/model/ObjectValueGreaterThanCondition.java b/src/src/main/java/com/relewise/client/model/ObjectValueGreaterThanCondition.java index 7bd5c76..8fb4a20 100644 --- a/src/src/main/java/com/relewise/client/model/ObjectValueGreaterThanCondition.java +++ b/src/src/main/java/com/relewise/client/model/ObjectValueGreaterThanCondition.java @@ -29,6 +29,28 @@ public class ObjectValueGreaterThanCondition extends ObjectValueCondition { public String $type = "Relewise.Client.Requests.Filters.DataObjects.Conditions.ObjectValueGreaterThanCondition, Relewise.Client"; public Double value; + public static ObjectValueGreaterThanCondition create(String key, String[] objectPath, Double value) + { + return new ObjectValueGreaterThanCondition(key, objectPath, value); + } + public ObjectValueGreaterThanCondition(String key, String[] objectPath, Double value) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.negated = false; + } + public static ObjectValueGreaterThanCondition create(String key, String[] objectPath, Double value, Boolean negated) + { + return new ObjectValueGreaterThanCondition(key, objectPath, value, negated); + } + public ObjectValueGreaterThanCondition(String key, String[] objectPath, Double value, Boolean negated) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.negated = negated; + } public static ObjectValueGreaterThanCondition create(String key, Double value) { return new ObjectValueGreaterThanCondition(key, value); diff --git a/src/src/main/java/com/relewise/client/model/ObjectValueInRangeCondition.java b/src/src/main/java/com/relewise/client/model/ObjectValueInRangeCondition.java index 8ceac8e..dde8d6c 100644 --- a/src/src/main/java/com/relewise/client/model/ObjectValueInRangeCondition.java +++ b/src/src/main/java/com/relewise/client/model/ObjectValueInRangeCondition.java @@ -29,6 +29,28 @@ public class ObjectValueInRangeCondition extends ObjectValueCondition { public String $type = "Relewise.Client.Requests.Filters.DataObjects.Conditions.ObjectValueInRangeCondition, Relewise.Client"; public DoubleRange range; + public static ObjectValueInRangeCondition create(String key, String[] objectPath, DoubleRange range) + { + return new ObjectValueInRangeCondition(key, objectPath, range); + } + public ObjectValueInRangeCondition(String key, String[] objectPath, DoubleRange range) + { + this.key = key; + this.objectPath = objectPath; + this.range = range; + this.negated = false; + } + public static ObjectValueInRangeCondition create(String key, String[] objectPath, DoubleRange range, Boolean negated) + { + return new ObjectValueInRangeCondition(key, objectPath, range, negated); + } + public ObjectValueInRangeCondition(String key, String[] objectPath, DoubleRange range, Boolean negated) + { + this.key = key; + this.objectPath = objectPath; + this.range = range; + this.negated = negated; + } public static ObjectValueInRangeCondition create(String key, DoubleRange range) { return new ObjectValueInRangeCondition(key, range); diff --git a/src/src/main/java/com/relewise/client/model/ObjectValueLessThanCondition.java b/src/src/main/java/com/relewise/client/model/ObjectValueLessThanCondition.java index 5de5145..d46adf5 100644 --- a/src/src/main/java/com/relewise/client/model/ObjectValueLessThanCondition.java +++ b/src/src/main/java/com/relewise/client/model/ObjectValueLessThanCondition.java @@ -29,6 +29,28 @@ public class ObjectValueLessThanCondition extends ObjectValueCondition { public String $type = "Relewise.Client.Requests.Filters.DataObjects.Conditions.ObjectValueLessThanCondition, Relewise.Client"; public Double value; + public static ObjectValueLessThanCondition create(String key, String[] objectPath, Double value) + { + return new ObjectValueLessThanCondition(key, objectPath, value); + } + public ObjectValueLessThanCondition(String key, String[] objectPath, Double value) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.negated = false; + } + public static ObjectValueLessThanCondition create(String key, String[] objectPath, Double value, Boolean negated) + { + return new ObjectValueLessThanCondition(key, objectPath, value, negated); + } + public ObjectValueLessThanCondition(String key, String[] objectPath, Double value, Boolean negated) + { + this.key = key; + this.objectPath = objectPath; + this.value = value; + this.negated = negated; + } public static ObjectValueLessThanCondition create(String key, Double value) { return new ObjectValueLessThanCondition(key, value); diff --git a/src/src/main/java/com/relewise/client/model/ObjectValueMaxByCondition.java b/src/src/main/java/com/relewise/client/model/ObjectValueMaxByCondition.java index 84516de..eb535a6 100644 --- a/src/src/main/java/com/relewise/client/model/ObjectValueMaxByCondition.java +++ b/src/src/main/java/com/relewise/client/model/ObjectValueMaxByCondition.java @@ -28,6 +28,26 @@ public class ObjectValueMaxByCondition extends ObjectValueCondition { public String $type = "Relewise.Client.Requests.Filters.DataObjects.Conditions.ObjectValueMaxByCondition, Relewise.Client"; + public static ObjectValueMaxByCondition create(String key, String... objectPath) + { + return new ObjectValueMaxByCondition(key, objectPath); + } + public ObjectValueMaxByCondition(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.negated = false; + } + public static ObjectValueMaxByCondition create(String key, String[] objectPath, Boolean negated) + { + return new ObjectValueMaxByCondition(key, objectPath, negated); + } + public ObjectValueMaxByCondition(String key, String[] objectPath, Boolean negated) + { + this.key = key; + this.objectPath = objectPath; + this.negated = negated; + } public static ObjectValueMaxByCondition create(String key) { return new ObjectValueMaxByCondition(key); diff --git a/src/src/main/java/com/relewise/client/model/ObjectValueMinByCondition.java b/src/src/main/java/com/relewise/client/model/ObjectValueMinByCondition.java index 845c197..b914552 100644 --- a/src/src/main/java/com/relewise/client/model/ObjectValueMinByCondition.java +++ b/src/src/main/java/com/relewise/client/model/ObjectValueMinByCondition.java @@ -28,6 +28,26 @@ public class ObjectValueMinByCondition extends ObjectValueCondition { public String $type = "Relewise.Client.Requests.Filters.DataObjects.Conditions.ObjectValueMinByCondition, Relewise.Client"; + public static ObjectValueMinByCondition create(String key, String... objectPath) + { + return new ObjectValueMinByCondition(key, objectPath); + } + public ObjectValueMinByCondition(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.negated = false; + } + public static ObjectValueMinByCondition create(String key, String[] objectPath, Boolean negated) + { + return new ObjectValueMinByCondition(key, objectPath, negated); + } + public ObjectValueMinByCondition(String key, String[] objectPath, Boolean negated) + { + this.key = key; + this.objectPath = objectPath; + this.negated = negated; + } public static ObjectValueMinByCondition create(String key) { return new ObjectValueMinByCondition(key); diff --git a/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java index 5c4e885..39b18b6 100644 --- a/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java +++ b/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java @@ -30,17 +30,18 @@ public class PersonalBrandRecommendationRequest extends BrandRecommendationReque public String $type = "Relewise.Client.Requests.Recommendations.PersonalBrandRecommendationRequest, Relewise.Client"; public Integer sinceMinutesAgo; public BrandRecommendationWeights weights; - public static PersonalBrandRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights) + public static PersonalBrandRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights, Integer sinceMinutesAgo) { - return new PersonalBrandRecommendationRequest(language, currency, displayedAtLocationType, user, weights); + return new PersonalBrandRecommendationRequest(language, currency, displayedAtLocationType, user, weights, sinceMinutesAgo); } - public PersonalBrandRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights) + public PersonalBrandRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; this.weights = weights; + this.sinceMinutesAgo = sinceMinutesAgo; } public PersonalBrandRecommendationRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java index a7ccc0a..884a71a 100644 --- a/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java +++ b/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java @@ -30,17 +30,18 @@ public class PersonalContentCategoryRecommendationRequest extends ContentCategor public String $type = "Relewise.Client.Requests.Recommendations.PersonalContentCategoryRecommendationRequest, Relewise.Client"; public Integer sinceMinutesAgo; public ContentCategoryRecommendationWeights weights; - public static PersonalContentCategoryRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights) + public static PersonalContentCategoryRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { - return new PersonalContentCategoryRecommendationRequest(language, currency, displayedAtLocationType, user, weights); + return new PersonalContentCategoryRecommendationRequest(language, currency, displayedAtLocationType, user, weights, sinceMinutesAgo); } - public PersonalContentCategoryRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights) + public PersonalContentCategoryRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; this.weights = weights; + this.sinceMinutesAgo = sinceMinutesAgo; } public PersonalContentCategoryRecommendationRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java index 868c455..164952f 100644 --- a/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java +++ b/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java @@ -30,17 +30,18 @@ public class PersonalProductCategoryRecommendationRequest extends ProductCategor public String $type = "Relewise.Client.Requests.Recommendations.PersonalProductCategoryRecommendationRequest, Relewise.Client"; public Integer sinceMinutesAgo; public ProductCategoryRecommendationWeights weights; - public static PersonalProductCategoryRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights) + public static PersonalProductCategoryRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { - return new PersonalProductCategoryRecommendationRequest(language, currency, displayedAtLocationType, user, weights); + return new PersonalProductCategoryRecommendationRequest(language, currency, displayedAtLocationType, user, weights, sinceMinutesAgo); } - public PersonalProductCategoryRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights) + public PersonalProductCategoryRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; this.weights = weights; + this.sinceMinutesAgo = sinceMinutesAgo; } public PersonalProductCategoryRecommendationRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java index f0ec008..1c5ede8 100644 --- a/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java +++ b/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java @@ -30,17 +30,18 @@ public class PopularBrandsRecommendationRequest extends BrandRecommendationReque public String $type = "Relewise.Client.Requests.Recommendations.PopularBrandsRecommendationRequest, Relewise.Client"; public Integer sinceMinutesAgo; public BrandRecommendationWeights weights; - public static PopularBrandsRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights) + public static PopularBrandsRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights, Integer sinceMinutesAgo) { - return new PopularBrandsRecommendationRequest(language, currency, displayedAtLocationType, user, weights); + return new PopularBrandsRecommendationRequest(language, currency, displayedAtLocationType, user, weights, sinceMinutesAgo); } - public PopularBrandsRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights) + public PopularBrandsRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, BrandRecommendationWeights weights, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; this.weights = weights; + this.sinceMinutesAgo = sinceMinutesAgo; } public PopularBrandsRecommendationRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java index 9e5ee3f..4bd22a8 100644 --- a/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java +++ b/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java @@ -30,17 +30,18 @@ public class PopularContentCategoriesRecommendationRequest extends ContentCatego public String $type = "Relewise.Client.Requests.Recommendations.PopularContentCategoriesRecommendationRequest, Relewise.Client"; public Integer sinceMinutesAgo; public ContentCategoryRecommendationWeights weights; - public static PopularContentCategoriesRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights) + public static PopularContentCategoriesRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { - return new PopularContentCategoriesRecommendationRequest(language, currency, displayedAtLocationType, user, weights); + return new PopularContentCategoriesRecommendationRequest(language, currency, displayedAtLocationType, user, weights, sinceMinutesAgo); } - public PopularContentCategoriesRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights) + public PopularContentCategoriesRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ContentCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; this.weights = weights; + this.sinceMinutesAgo = sinceMinutesAgo; } public PopularContentCategoriesRecommendationRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java b/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java index c287e79..e12f6c1 100644 --- a/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java +++ b/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java @@ -29,16 +29,17 @@ public class PopularContentsRequest extends ContentRecommendationRequest impleme { public String $type = "Relewise.Client.Requests.Recommendations.PopularContentsRequest, Relewise.Client"; public Integer sinceMinutesAgo; - public static PopularContentsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user) + public static PopularContentsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, Integer sinceMinutesAgo) { - return new PopularContentsRequest(language, currency, displayedAtLocationType, user); + return new PopularContentsRequest(language, currency, displayedAtLocationType, user, sinceMinutesAgo); } - public PopularContentsRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user) + public PopularContentsRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; + this.sinceMinutesAgo = sinceMinutesAgo; } public PopularContentsRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java index d3dfb9c..a1944e0 100644 --- a/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java +++ b/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java @@ -30,17 +30,18 @@ public class PopularProductCategoriesRecommendationRequest extends ProductCatego public String $type = "Relewise.Client.Requests.Recommendations.PopularProductCategoriesRecommendationRequest, Relewise.Client"; public Integer sinceMinutesAgo; public ProductCategoryRecommendationWeights weights; - public static PopularProductCategoriesRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights) + public static PopularProductCategoriesRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { - return new PopularProductCategoriesRecommendationRequest(language, currency, displayedAtLocationType, user, weights); + return new PopularProductCategoriesRecommendationRequest(language, currency, displayedAtLocationType, user, weights, sinceMinutesAgo); } - public PopularProductCategoriesRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights) + public PopularProductCategoriesRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductCategoryRecommendationWeights weights, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; this.weights = weights; + this.sinceMinutesAgo = sinceMinutesAgo; } public PopularProductCategoriesRecommendationRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java b/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java index 548930c..ff2ba8e 100644 --- a/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java +++ b/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java @@ -30,17 +30,18 @@ public class PopularProductsRequest extends ProductRecommendationRequest impleme public String $type = "Relewise.Client.Requests.Recommendations.PopularProductsRequest, Relewise.Client"; public PopularityTypes basedOn; public Integer sinceMinutesAgo; - public static PopularProductsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, PopularityTypes basedOn) + public static PopularProductsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, PopularityTypes basedOn, Integer sinceMinutesAgo) { - return new PopularProductsRequest(language, currency, displayedAtLocationType, user, basedOn); + return new PopularProductsRequest(language, currency, displayedAtLocationType, user, basedOn, sinceMinutesAgo); } - public PopularProductsRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, PopularityTypes basedOn) + public PopularProductsRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, PopularityTypes basedOn, Integer sinceMinutesAgo) { this.language = language; this.currency = currency; this.displayedAtLocationType = displayedAtLocationType; this.user = user; this.basedOn = basedOn; + this.sinceMinutesAgo = sinceMinutesAgo; } public PopularProductsRequest() { diff --git a/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java index 3eace70..8a5cfc1 100644 --- a/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java +++ b/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java @@ -30,6 +30,18 @@ public class PopularSearchTermsRecommendationRequest extends RecommendationReque public String $type = "Relewise.Client.Requests.Recommendations.PopularSearchTermsRecommendationRequest, Relewise.Client"; public @Nullable String term; public @Nullable RecommendPopularSearchTermSettings settings; + public static PopularSearchTermsRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, String term) + { + return new PopularSearchTermsRecommendationRequest(language, currency, displayedAtLocationType, user, term); + } + public PopularSearchTermsRecommendationRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, String term) + { + this.language = language; + this.currency = currency; + this.displayedAtLocationType = displayedAtLocationType; + this.user = user; + this.term = term; + } public static PopularSearchTermsRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user) { return new PopularSearchTermsRecommendationRequest(language, currency, displayedAtLocationType, user); diff --git a/src/src/main/java/com/relewise/client/model/PredictionRule.java b/src/src/main/java/com/relewise/client/model/PredictionRule.java index b514ac4..4420a00 100644 --- a/src/src/main/java/com/relewise/client/model/PredictionRule.java +++ b/src/src/main/java/com/relewise/client/model/PredictionRule.java @@ -31,6 +31,20 @@ public class PredictionRule extends SearchRule public SearchTermCondition condition; public PredictionRulePromotion promote; public PredictionRuleSuppression suppress; + public static PredictionRule create(UUID id, @Nullable ApplicableIndexes indexes, @Nullable ApplicableLanguages languages, Boolean isApproved, SearchTermCondition condition, PredictionRulePromotion promote, PredictionRuleSuppression suppress) + { + return new PredictionRule(id, indexes, languages, isApproved, condition, promote, suppress); + } + public PredictionRule(UUID id, @Nullable ApplicableIndexes indexes, @Nullable ApplicableLanguages languages, Boolean isApproved, SearchTermCondition condition, PredictionRulePromotion promote, PredictionRuleSuppression suppress) + { + this.id = id; + this.indexes = indexes; + this.languages = languages; + this.isApproved = isApproved; + this.condition = condition; + this.promote = promote; + this.suppress = suppress; + } public static PredictionRule create(UUID id, @Nullable ApplicableIndexes indexes, @Nullable ApplicableLanguages languages, Boolean isApproved, SearchTermCondition condition, PredictionRulePromotion promote) { return new PredictionRule(id, indexes, languages, isApproved, condition, promote); diff --git a/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java index 7321a3b..be7fbe6 100644 --- a/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java +++ b/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java @@ -45,6 +45,17 @@ public ProductAdministrativeAction(@Nullable Language language, @Nullable Curren this.productUpdateKind = productUpdateKind; this.variantUpdateKind = variantUpdateKind; } + public static ProductAdministrativeAction create(@Nullable Language language, @Nullable Currency currency, FilterCollection filters, ProductAdministrativeActionUpdateKind productUpdateKind) + { + return new ProductAdministrativeAction(language, currency, filters, productUpdateKind); + } + public ProductAdministrativeAction(@Nullable Language language, @Nullable Currency currency, FilterCollection filters, ProductAdministrativeActionUpdateKind productUpdateKind) + { + this.language = language; + this.currency = currency; + this.filters = filters; + this.productUpdateKind = productUpdateKind; + } public ProductAdministrativeAction() { } diff --git a/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java b/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java index 80f4acd..b7a0330 100644 --- a/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java +++ b/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java @@ -28,6 +28,34 @@ public class ProductCategoryDataFilter extends DataFilter implements ICategoryFilter { public String $type = "Relewise.Client.Requests.Filters.ProductCategoryDataFilter, Relewise.Client"; + public static ProductCategoryDataFilter create(String key, String... objectPath) + { + return new ProductCategoryDataFilter(key, objectPath); + } + public ProductCategoryDataFilter(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = null; + this.mustMatchAllConditions = true; + this.filterOutIfKeyIsNotFound = true; + this.language = null; + this.currency = null; + } + public static ProductCategoryDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + return new ProductCategoryDataFilter(key, objectPath, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); + } + public ProductCategoryDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; + this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; + this.language = language; + this.currency = currency; + } public static ProductCategoryDataFilter create(String key) { return new ProductCategoryDataFilter(key); @@ -35,17 +63,21 @@ public static ProductCategoryDataFilter create(String key) public ProductCategoryDataFilter(String key) { this.key = key; + this.conditions = null; + this.mustMatchAllConditions = true; this.filterOutIfKeyIsNotFound = true; this.language = null; this.currency = null; } - public static ProductCategoryDataFilter create(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public static ProductCategoryDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { - return new ProductCategoryDataFilter(key, filterOutIfKeyIsNotFound, language, currency); + return new ProductCategoryDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); } - public ProductCategoryDataFilter(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public ProductCategoryDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { this.key = key; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; this.language = language; this.currency = currency; diff --git a/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java b/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java index 4b02690..7d83254 100644 --- a/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java +++ b/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java @@ -32,6 +32,21 @@ public class ProductCategorySearchRequest extends PaginatedSearchRequest impleme public @Nullable ProductCategorySearchSettings settings; public @Nullable ProductCategoryFacetQuery facets; public @Nullable ProductCategorySortBySpecification sorting; + public static ProductCategorySearchRequest create(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) + { + return new ProductCategorySearchRequest(language, currency, indexSelector, user, displayedAtLocation, term, skip, take); + } + public ProductCategorySearchRequest(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) + { + this.language = language; + this.currency = currency; + this.indexSelector = indexSelector; + this.user = user; + this.displayedAtLocation = displayedAtLocation; + this.term = term; + this.skip = skip; + this.take = take; + } public static ProductCategorySearchRequest create(@Nullable Language language, @Nullable Currency currency, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) { return new ProductCategorySearchRequest(language, currency, user, displayedAtLocation, term, skip, take); diff --git a/src/src/main/java/com/relewise/client/model/ProductDataFilter.java b/src/src/main/java/com/relewise/client/model/ProductDataFilter.java index 81d6c66..989666f 100644 --- a/src/src/main/java/com/relewise/client/model/ProductDataFilter.java +++ b/src/src/main/java/com/relewise/client/model/ProductDataFilter.java @@ -28,6 +28,34 @@ public class ProductDataFilter extends DataFilter implements IProductFilter { public String $type = "Relewise.Client.Requests.Filters.ProductDataFilter, Relewise.Client"; + public static ProductDataFilter create(String key, String... objectPath) + { + return new ProductDataFilter(key, objectPath); + } + public ProductDataFilter(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = null; + this.mustMatchAllConditions = true; + this.filterOutIfKeyIsNotFound = true; + this.language = null; + this.currency = null; + } + public static ProductDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + return new ProductDataFilter(key, objectPath, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); + } + public ProductDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; + this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; + this.language = language; + this.currency = currency; + } public static ProductDataFilter create(String key) { return new ProductDataFilter(key); @@ -35,17 +63,21 @@ public static ProductDataFilter create(String key) public ProductDataFilter(String key) { this.key = key; + this.conditions = null; + this.mustMatchAllConditions = true; this.filterOutIfKeyIsNotFound = true; this.language = null; this.currency = null; } - public static ProductDataFilter create(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public static ProductDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { - return new ProductDataFilter(key, filterOutIfKeyIsNotFound, language, currency); + return new ProductDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); } - public ProductDataFilter(String key, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public ProductDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { this.key = key; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; this.language = language; this.currency = currency; diff --git a/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java b/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java index 60c91c6..39460e8 100644 --- a/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java +++ b/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java @@ -32,6 +32,21 @@ public class ProductSearchRequest extends PaginatedSearchRequest implements IUse public @Nullable ProductFacetQuery facets; public @Nullable ProductSearchSettings settings; public @Nullable ProductSortBySpecification sorting; + public static ProductSearchRequest create(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) + { + return new ProductSearchRequest(language, currency, indexSelector, user, displayedAtLocation, term, skip, take); + } + public ProductSearchRequest(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) + { + this.language = language; + this.currency = currency; + this.indexSelector = indexSelector; + this.user = user; + this.displayedAtLocation = displayedAtLocation; + this.term = term; + this.skip = skip; + this.take = take; + } public static ProductSearchRequest create(@Nullable Language language, @Nullable Currency currency, User user, String displayedAtLocation, @Nullable String term, Integer skip, Integer take) { return new ProductSearchRequest(language, currency, user, displayedAtLocation, term, skip, take); diff --git a/src/src/main/java/com/relewise/client/model/SaveDecompoundRulesRequest.java b/src/src/main/java/com/relewise/client/model/SaveDecompoundRulesRequest.java index 5102524..46dd843 100644 --- a/src/src/main/java/com/relewise/client/model/SaveDecompoundRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/SaveDecompoundRulesRequest.java @@ -28,12 +28,13 @@ public class SaveDecompoundRulesRequest extends DecompoundRuleSaveSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.SaveDecompoundRulesRequest, Relewise.Client"; - public static SaveDecompoundRulesRequest create(String modifiedBy) + public static SaveDecompoundRulesRequest create(DecompoundRule[] rules, String modifiedBy) { - return new SaveDecompoundRulesRequest(modifiedBy); + return new SaveDecompoundRulesRequest(rules, modifiedBy); } - public SaveDecompoundRulesRequest(String modifiedBy) + public SaveDecompoundRulesRequest(DecompoundRule[] rules, String modifiedBy) { + this.rules = rules; this.modifiedBy = modifiedBy; } public SaveDecompoundRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/SavePredictionRulesRequest.java b/src/src/main/java/com/relewise/client/model/SavePredictionRulesRequest.java index db50d5f..8dc97cd 100644 --- a/src/src/main/java/com/relewise/client/model/SavePredictionRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/SavePredictionRulesRequest.java @@ -28,12 +28,13 @@ public class SavePredictionRulesRequest extends PredictionRuleSaveSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.SavePredictionRulesRequest, Relewise.Client"; - public static SavePredictionRulesRequest create(String modifiedBy) + public static SavePredictionRulesRequest create(PredictionRule[] rules, String modifiedBy) { - return new SavePredictionRulesRequest(modifiedBy); + return new SavePredictionRulesRequest(rules, modifiedBy); } - public SavePredictionRulesRequest(String modifiedBy) + public SavePredictionRulesRequest(PredictionRule[] rules, String modifiedBy) { + this.rules = rules; this.modifiedBy = modifiedBy; } public SavePredictionRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/SaveRedirectRulesRequest.java b/src/src/main/java/com/relewise/client/model/SaveRedirectRulesRequest.java index 5804410..0c5127f 100644 --- a/src/src/main/java/com/relewise/client/model/SaveRedirectRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/SaveRedirectRulesRequest.java @@ -28,12 +28,13 @@ public class SaveRedirectRulesRequest extends RedirectRuleSaveSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.SaveRedirectRulesRequest, Relewise.Client"; - public static SaveRedirectRulesRequest create(String modifiedBy) + public static SaveRedirectRulesRequest create(RedirectRule[] rules, String modifiedBy) { - return new SaveRedirectRulesRequest(modifiedBy); + return new SaveRedirectRulesRequest(rules, modifiedBy); } - public SaveRedirectRulesRequest(String modifiedBy) + public SaveRedirectRulesRequest(RedirectRule[] rules, String modifiedBy) { + this.rules = rules; this.modifiedBy = modifiedBy; } public SaveRedirectRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/SaveStemmingRulesRequest.java b/src/src/main/java/com/relewise/client/model/SaveStemmingRulesRequest.java index fc2e5d3..8c88816 100644 --- a/src/src/main/java/com/relewise/client/model/SaveStemmingRulesRequest.java +++ b/src/src/main/java/com/relewise/client/model/SaveStemmingRulesRequest.java @@ -28,12 +28,13 @@ public class SaveStemmingRulesRequest extends StemmingRuleSaveSearchRulesRequest { public String $type = "Relewise.Client.Requests.Search.Rules.SaveStemmingRulesRequest, Relewise.Client"; - public static SaveStemmingRulesRequest create(String modifiedBy) + public static SaveStemmingRulesRequest create(StemmingRule[] rules, String modifiedBy) { - return new SaveStemmingRulesRequest(modifiedBy); + return new SaveStemmingRulesRequest(rules, modifiedBy); } - public SaveStemmingRulesRequest(String modifiedBy) + public SaveStemmingRulesRequest(StemmingRule[] rules, String modifiedBy) { + this.rules = rules; this.modifiedBy = modifiedBy; } public SaveStemmingRulesRequest() diff --git a/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java b/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java index 0d7b4d5..e49fddf 100644 --- a/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java +++ b/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java @@ -29,6 +29,19 @@ public class SearchRequestCollection extends SearchRequest implements IUserIdent { public String $type = "Relewise.Client.Requests.Search.SearchRequestCollection, Relewise.Client"; public ArrayList requests; + public static SearchRequestCollection create(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, @Nullable User user, @Nullable String displayedAtLocation, SearchRequest... requests) + { + return new SearchRequestCollection(language, currency, indexSelector, user, displayedAtLocation, requests); + } + public SearchRequestCollection(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, @Nullable User user, @Nullable String displayedAtLocation, SearchRequest... requests) + { + this.language = language; + this.currency = currency; + this.indexSelector = indexSelector; + this.user = user; + this.displayedAtLocation = displayedAtLocation; + this.requests = new ArrayList<>(Arrays.asList(requests)); + } public static SearchRequestCollection create(SearchRequest... requests) { return new SearchRequestCollection(requests); diff --git a/src/src/main/java/com/relewise/client/model/SearchRuleFilters.java b/src/src/main/java/com/relewise/client/model/SearchRuleFilters.java index 8eff0cd..27ecea7 100644 --- a/src/src/main/java/com/relewise/client/model/SearchRuleFilters.java +++ b/src/src/main/java/com/relewise/client/model/SearchRuleFilters.java @@ -34,6 +34,14 @@ public SearchRuleFilters(@Nullable String term, @Nullable Boolean approved) this.term = term; this.approved = approved; } + public static SearchRuleFilters create(UUID id) + { + return new SearchRuleFilters(id); + } + public SearchRuleFilters(UUID id) + { + this.id = id; + } public SearchRuleFilters() { } diff --git a/src/src/main/java/com/relewise/client/model/SearchTermCondition.java b/src/src/main/java/com/relewise/client/model/SearchTermCondition.java index b4cbd7e..910943e 100644 --- a/src/src/main/java/com/relewise/client/model/SearchTermCondition.java +++ b/src/src/main/java/com/relewise/client/model/SearchTermCondition.java @@ -47,6 +47,14 @@ public SearchTermCondition(SearchTermConditionConditionKind kind, String value, this.value = value; this.minimumLength = minimumLength; } + public static SearchTermCondition create(Integer minimumLength) + { + return new SearchTermCondition(minimumLength); + } + public SearchTermCondition(Integer minimumLength) + { + this.minimumLength = minimumLength; + } public SearchTermCondition() { this.minimumLength = null; diff --git a/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java b/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java index 10cc81a..9fc862e 100644 --- a/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java +++ b/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java @@ -31,6 +31,20 @@ public class SearchTermPredictionRequest extends SearchRequest implements IUserI public String term; public Integer take; public @Nullable SearchTermPredictionSettings settings; + public static SearchTermPredictionRequest create(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, String term, Integer take) + { + return new SearchTermPredictionRequest(language, currency, indexSelector, user, displayedAtLocation, term, take); + } + public SearchTermPredictionRequest(@Nullable Language language, @Nullable Currency currency, @Nullable SearchIndexSelector indexSelector, User user, String displayedAtLocation, String term, Integer take) + { + this.language = language; + this.currency = currency; + this.indexSelector = indexSelector; + this.user = user; + this.displayedAtLocation = displayedAtLocation; + this.term = term; + this.take = take; + } public static SearchTermPredictionRequest create(@Nullable Language language, @Nullable Currency currency, User user, String displayedAtLocation, String term, Integer take) { return new SearchTermPredictionRequest(language, currency, user, displayedAtLocation, term, take); diff --git a/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java b/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java index 5c7367d..da8cb39 100644 --- a/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java +++ b/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java @@ -32,6 +32,34 @@ public class SimilarProductsRequest extends ProductRecommendationRequest impleme public @Nullable Product productData; public Boolean considerAlreadyKnownInformationAboutProduct; public @Nullable SimilarProductsEvaluationSettings evaluationSettings; + public static SimilarProductsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, Product productData, Boolean considerAlreadyKnownInformationAboutProduct) + { + return new SimilarProductsRequest(language, currency, displayedAtLocationType, user, productData, considerAlreadyKnownInformationAboutProduct); + } + public SimilarProductsRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, Product productData, Boolean considerAlreadyKnownInformationAboutProduct) + { + this.language = language; + this.currency = currency; + this.displayedAtLocationType = displayedAtLocationType; + this.user = user; + this.productData = productData; + this.considerAlreadyKnownInformationAboutProduct = considerAlreadyKnownInformationAboutProduct; + this.evaluationSettings = null; + } + public static SimilarProductsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, Product productData, Boolean considerAlreadyKnownInformationAboutProduct, SimilarProductsEvaluationSettings evaluationSettings) + { + return new SimilarProductsRequest(language, currency, displayedAtLocationType, user, productData, considerAlreadyKnownInformationAboutProduct, evaluationSettings); + } + public SimilarProductsRequest(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, Product productData, Boolean considerAlreadyKnownInformationAboutProduct, SimilarProductsEvaluationSettings evaluationSettings) + { + this.language = language; + this.currency = currency; + this.displayedAtLocationType = displayedAtLocationType; + this.user = user; + this.productData = productData; + this.considerAlreadyKnownInformationAboutProduct = considerAlreadyKnownInformationAboutProduct; + this.evaluationSettings = evaluationSettings; + } public static SimilarProductsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user, ProductAndVariantId existingProductId) { return new SimilarProductsRequest(language, currency, displayedAtLocationType, user, existingProductId); diff --git a/src/src/main/java/com/relewise/client/model/TriggerConfigurationRequest.java b/src/src/main/java/com/relewise/client/model/TriggerConfigurationRequest.java index 1dd3ad9..36c4606 100644 --- a/src/src/main/java/com/relewise/client/model/TriggerConfigurationRequest.java +++ b/src/src/main/java/com/relewise/client/model/TriggerConfigurationRequest.java @@ -39,6 +39,14 @@ public TriggerConfigurationRequest(UUID id, Integer type) this.id = id; this.type = type; } + public static TriggerConfigurationRequest create(UUID id) + { + return new TriggerConfigurationRequest(id); + } + public TriggerConfigurationRequest(UUID id) + { + this.id = id; + } public TriggerConfigurationRequest() { } diff --git a/src/src/main/java/com/relewise/client/model/VariantDataFilter.java b/src/src/main/java/com/relewise/client/model/VariantDataFilter.java index b01197c..0eab4a8 100644 --- a/src/src/main/java/com/relewise/client/model/VariantDataFilter.java +++ b/src/src/main/java/com/relewise/client/model/VariantDataFilter.java @@ -28,6 +28,34 @@ public class VariantDataFilter extends DataFilter implements IVariantFilter { public String $type = "Relewise.Client.Requests.Filters.VariantDataFilter, Relewise.Client"; + public static VariantDataFilter create(String key, String... objectPath) + { + return new VariantDataFilter(key, objectPath); + } + public VariantDataFilter(String key, String... objectPath) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = null; + this.mustMatchAllConditions = true; + this.filterOutIfKeyIsNotFound = true; + this.language = null; + this.currency = null; + } + public static VariantDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + return new VariantDataFilter(key, objectPath, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); + } + public VariantDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + { + this.key = key; + this.objectPath = objectPath; + this.conditions = conditions; + this.mustMatchAllConditions = mustMatchAllConditions; + this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; + this.language = language; + this.currency = currency; + } public static VariantDataFilter create(String key) { return new VariantDataFilter(key); @@ -35,18 +63,20 @@ public static VariantDataFilter create(String key) public VariantDataFilter(String key) { this.key = key; + this.conditions = null; this.mustMatchAllConditions = true; this.filterOutIfKeyIsNotFound = true; this.language = null; this.currency = null; } - public static VariantDataFilter create(String key, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public static VariantDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { - return new VariantDataFilter(key, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); + return new VariantDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency); } - public VariantDataFilter(String key, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) + public VariantDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency) { this.key = key; + this.conditions = conditions; this.mustMatchAllConditions = mustMatchAllConditions; this.filterOutIfKeyIsNotFound = filterOutIfKeyIsNotFound; this.language = language; diff --git a/src/src/test/java/com/relewise/client/BatchedContentRecommendationsTest.java b/src/src/test/java/com/relewise/client/BatchedContentRecommendationsTest.java index 4442b96..d9957ca 100644 --- a/src/src/test/java/com/relewise/client/BatchedContentRecommendationsTest.java +++ b/src/src/test/java/com/relewise/client/BatchedContentRecommendationsTest.java @@ -17,7 +17,8 @@ public void testBatchedProductRecommendations() throws Exception { Language.create("en-US"), Currency.create("USD"), "batched integration test", - UserFactory.byTemporaryId("t-Id") + UserFactory.byTemporaryId("t-Id"), + 100000 ).setSettings(ContentRecommendationRequestSettings.create().setNumberOfRecommendations(1)), ContentsViewedAfterViewingContentRequest.create( Language.create("en-US"), diff --git a/src/src/test/java/com/relewise/client/ContentRecommendationsTest.java b/src/src/test/java/com/relewise/client/ContentRecommendationsTest.java index 7804398..6ce5f48 100644 --- a/src/src/test/java/com/relewise/client/ContentRecommendationsTest.java +++ b/src/src/test/java/com/relewise/client/ContentRecommendationsTest.java @@ -33,8 +33,9 @@ public void testPopularContent() throws Exception { Language.create("en-US"), Currency.create("USD"), "integration test", - UserFactory.byTemporaryId("t-Id") - ).setSinceMinutesAgo(500000); + UserFactory.byTemporaryId("t-Id"), + 500000 + ); var response = recommender.recommend(popularContents); assertNotNull(response);