Merge branch 'main' into feature/generate-from-version-1-170-0

Relewise · Sep 26, 2024 · 101186e · 101186e
2 parents a2d7c89 + 2911369
commit 101186e
Show file tree

Hide file tree

Showing 46 changed files with 400 additions and 109 deletions.
diff --git a/Generator/JavaMemberWriters/JavaCreatorMethodWriter.cs b/Generator/JavaMemberWriters/JavaCreatorMethodWriter.cs
@@ -186,7 +186,7 @@ private void WriteCreatorMethodBody(IndentedTextWriter writer, string variable,
             if (propertyName is not null)
             {
                 if (property!.PropertyType.IsGenericType && property!.PropertyType.GetGenericTypeDefinition() == typeof(List<>) && (parameter.ParameterType.IsArray
-                    || (parameter == parameters.Last() && javaWriter.BetterTypedParameterTypeName(parameter.ParameterType, new NullabilityInfoContext().Create(parameter)).Contains("..."))))
+                    || (parameter == parameters.Last() && javaWriter.BetterTypedParameterTypeName(parameter).Contains("..."))))
                 {
                     writer.WriteLine($"{variable}.{propertyName.AsFieldName()} = new ArrayList<>(Arrays.asList({parameter.Name.AsFieldName()}));");
                 }
@@ -262,7 +262,7 @@ private string ParameterList(ParameterInfo[] parameters)
     {
         return string.Join(", ",
             parameters.Select(parameter =>
-                $"{(parameters[^1] == parameter ? javaWriter.BetterTypedParameterTypeName(parameter.ParameterType, new NullabilityInfoContext().Create(parameter)) : javaWriter.TypeName(parameter))} {parameter.Name.AsFieldName()}"
+                $"{(parameters[^1] == parameter ? javaWriter.BetterTypedParameterTypeName(parameter) : javaWriter.TypeName(parameter))} {parameter.Name.AsFieldName()}"
             )
         );
     }

diff --git a/Generator/JavaWriter.cs b/Generator/JavaWriter.cs
@@ -103,8 +103,11 @@ private static string PrependNullableIfApplicable(string typeName, NullabilityIn
         return typeName;
     }
 
-    public string BetterTypedParameterTypeName(Type parameterType, NullabilityInfo nullabilityInfo)
+    public string BetterTypedParameterTypeName(ParameterInfo parameter)
     {
+        Type parameterType = parameter.ParameterType;
+        var nullabilityInfo = new NullabilityInfoContext().Create(parameter);
+
         if (nullabilityInfo.WriteState is NullabilityState.Nullable)
         {
             parameterType = nullabilityInfo.Type;
@@ -114,7 +117,7 @@ parameterType.GenericTypeArguments is [var elementType]
                 ? TypeName(elementType) + "..."
                 : parameterType.IsArray
                     ? TypeName(parameterType.GetElementType()!) + "..."
-                    : TypeName(parameterType);
+                    : PrependNullableIfApplicable(TypeName(parameterType), nullabilityInfo);
     }
 
     public string BetterTypedParameterTypeName(PropertyInfo property, NullabilityInfo nullabilityInfo)

diff --git a/src/src/main/java/com/relewise/client/factory/DataValueFactory.java b/src/src/main/java/com/relewise/client/factory/DataValueFactory.java
@@ -19,6 +19,12 @@ public static DataValue create(double value) {
             .setValue(value);
     }
 
+    public static DataValue create(boolean value) {
+        return DataValue.create()
+            .setType(DataValueDataValueTypes.Boolean)
+            .setValue(value);
+    }
+
     public static DataValue create(MultiCurrency value) {
         return DataValue.create()
             .setType(DataValueDataValueTypes.MultiCurrency)

diff --git a/src/src/main/java/com/relewise/client/model/Advertiser.java b/src/src/main/java/com/relewise/client/model/Advertiser.java
@@ -31,11 +31,11 @@ public class Advertiser extends AdvertiserEntityStateAdvertiserMetadataValuesRet
     public @Nullable PromotionSpecificationCollection allowedPromotions;
     /** Defines locations/placements/variations where this advertiser is allowed to make promotions at. If <code>null</code> or empty, an advertiser will not be allowed to make any promotions anywhere, only useful for Advertisers in draft. */
     public @Nullable PromotionLocationCollection allowedLocations;
-    public static Advertiser create(@Nullable UUID id, AdvertiserEntityState state, String name, @Nullable PromotionSpecificationCollection allowedPromotions, PromotionLocationCollection allowedLocations)
+    public static Advertiser create(@Nullable UUID id, AdvertiserEntityState state, String name, @Nullable PromotionSpecificationCollection allowedPromotions, @Nullable PromotionLocationCollection allowedLocations)
     {
         return new Advertiser(id, state, name, allowedPromotions, allowedLocations);
     }
-    public Advertiser(@Nullable UUID id, AdvertiserEntityState state, String name, @Nullable PromotionSpecificationCollection allowedPromotions, PromotionLocationCollection allowedLocations)
+    public Advertiser(@Nullable UUID id, AdvertiserEntityState state, String name, @Nullable PromotionSpecificationCollection allowedPromotions, @Nullable PromotionLocationCollection allowedLocations)
     {
         this.id = id;
         this.state = state;

diff --git a/src/src/main/java/com/relewise/client/model/BrandDataFilter.java b/src/src/main/java/com/relewise/client/model/BrandDataFilter.java
@@ -40,11 +40,11 @@ public BrandDataFilter(String key, String... objectPath)
         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)
+    public static BrandDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable 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)
+    public BrandDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.objectPath = objectPath;
@@ -67,11 +67,11 @@ public BrandDataFilter(String key)
         this.language = null;
         this.currency = null;
     }
-    public static BrandDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public static BrandDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         return new BrandDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency);
     }
-    public BrandDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public BrandDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.conditions = conditions;

diff --git a/src/src/main/java/com/relewise/client/model/BrandQuery.java b/src/src/main/java/com/relewise/client/model/BrandQuery.java
@@ -42,11 +42,11 @@ public BrandQuery()
         this.language = null;
         this.currency = null;
     }
-    public static BrandQuery create(@Nullable Language language, Currency currency)
+    public static BrandQuery create(@Nullable Language language, @Nullable Currency currency)
     {
         return new BrandQuery(language, currency);
     }
-    public BrandQuery(@Nullable Language language, Currency currency)
+    public BrandQuery(@Nullable Language language, @Nullable Currency currency)
     {
         this.language = language;
         this.currency = currency;

diff --git a/src/src/main/java/com/relewise/client/model/CampaignAnalyticsRequest.java b/src/src/main/java/com/relewise/client/model/CampaignAnalyticsRequest.java
@@ -31,11 +31,11 @@ public class CampaignAnalyticsRequest extends LicensedRequest
     public UUID id;
     public LocalDateTimeRange periodUtc;
     public @Nullable FilterCollection filters;
-    public static CampaignAnalyticsRequest create(UUID id, LocalDateTimeRange periodUtc, FilterCollection filters)
+    public static CampaignAnalyticsRequest create(UUID id, LocalDateTimeRange periodUtc, @Nullable FilterCollection filters)
     {
         return new CampaignAnalyticsRequest(id, periodUtc, filters);
     }
-    public CampaignAnalyticsRequest(UUID id, LocalDateTimeRange periodUtc, FilterCollection filters)
+    public CampaignAnalyticsRequest(UUID id, LocalDateTimeRange periodUtc, @Nullable FilterCollection filters)
     {
         this.id = id;
         this.periodUtc = periodUtc;

diff --git a/src/src/main/java/com/relewise/client/model/CartDataFilter.java b/src/src/main/java/com/relewise/client/model/CartDataFilter.java
@@ -45,11 +45,11 @@ public CartDataFilter(String key)
         this.language = null;
         this.currency = null;
     }
-    public static CartDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public static CartDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         return new CartDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency);
     }
-    public CartDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public CartDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.conditions = conditions;

diff --git a/src/src/main/java/com/relewise/client/model/CategoryNameAndId.java b/src/src/main/java/com/relewise/client/model/CategoryNameAndId.java
@@ -37,7 +37,7 @@ public CategoryNameAndId(String id)
      * @param id The ID of the category (Which is generally very unlikely to change in the future)
      * @param displayName The Display name of the category (More likely to change in the future)
      */
-    public static CategoryNameAndId create(String id, Multilingual displayName)
+    public static CategoryNameAndId create(String id, @Nullable Multilingual displayName)
     {
         return new CategoryNameAndId(id, displayName);
     }
@@ -46,7 +46,7 @@ public static CategoryNameAndId create(String id, Multilingual displayName)
      * @param id The ID of the category (Which is generally very unlikely to change in the future)
      * @param displayName The Display name of the category (More likely to change in the future)
      */
-    public CategoryNameAndId(String id, Multilingual displayName)
+    public CategoryNameAndId(String id, @Nullable Multilingual displayName)
     {
         this.id = id;
         this.displayName = displayName;

diff --git a/src/src/main/java/com/relewise/client/model/CompanyDataFilter.java b/src/src/main/java/com/relewise/client/model/CompanyDataFilter.java
@@ -40,11 +40,11 @@ public CompanyDataFilter(String key, String... objectPath)
         this.language = null;
         this.currency = null;
     }
-    public static CompanyDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public static CompanyDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         return new CompanyDataFilter(key, objectPath, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency);
     }
-    public CompanyDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public CompanyDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.objectPath = objectPath;
@@ -67,11 +67,11 @@ public CompanyDataFilter(String key)
         this.language = null;
         this.currency = null;
     }
-    public static CompanyDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public static CompanyDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         return new CompanyDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency);
     }
-    public CompanyDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public CompanyDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.conditions = conditions;

diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java b/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java
@@ -40,11 +40,11 @@ public ContentCategoryDataFilter(String key, String... objectPath)
         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)
+    public static ContentCategoryDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable 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)
+    public ContentCategoryDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.objectPath = objectPath;
@@ -67,11 +67,11 @@ public ContentCategoryDataFilter(String key)
         this.language = null;
         this.currency = null;
     }
-    public static ContentCategoryDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public static ContentCategoryDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         return new ContentCategoryDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency);
     }
-    public ContentCategoryDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public ContentCategoryDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.conditions = conditions;

diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryQuery.java b/src/src/main/java/com/relewise/client/model/ContentCategoryQuery.java
@@ -35,11 +35,11 @@ public ContentCategoryQuery()
         this.language = null;
         this.currency = null;
     }
-    public static ContentCategoryQuery create(@Nullable Language language, Currency currency)
+    public static ContentCategoryQuery create(@Nullable Language language, @Nullable Currency currency)
     {
         return new ContentCategoryQuery(language, currency);
     }
-    public ContentCategoryQuery(@Nullable Language language, Currency currency)
+    public ContentCategoryQuery(@Nullable Language language, @Nullable Currency currency)
     {
         this.language = language;
         this.currency = currency;

diff --git a/src/src/main/java/com/relewise/client/model/ContentDataDoubleRangeFacet.java b/src/src/main/java/com/relewise/client/model/ContentDataDoubleRangeFacet.java
@@ -26,11 +26,11 @@
 public class ContentDataDoubleRangeFacet extends DoubleContentDataRangeFacet
 {
     public String $type = "Relewise.Client.DataTypes.Search.Facets.Queries.ContentDataDoubleRangeFacet, Relewise.Client";
-    public static ContentDataDoubleRangeFacet create(String key, DoubleRange selected)
+    public static ContentDataDoubleRangeFacet create(String key, @Nullable DoubleRange selected)
     {
         return new ContentDataDoubleRangeFacet(key, selected);
     }
-    public ContentDataDoubleRangeFacet(String key, DoubleRange selected)
+    public ContentDataDoubleRangeFacet(String key, @Nullable DoubleRange selected)
     {
         this.key = key;
         this.selected = selected;

diff --git a/src/src/main/java/com/relewise/client/model/ContentDataFilter.java b/src/src/main/java/com/relewise/client/model/ContentDataFilter.java
@@ -40,11 +40,11 @@ public ContentDataFilter(String key, String... objectPath)
         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)
+    public static ContentDataFilter create(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable 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)
+    public ContentDataFilter(String key, String[] objectPath, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.objectPath = objectPath;
@@ -67,11 +67,11 @@ public ContentDataFilter(String key)
         this.language = null;
         this.currency = null;
     }
-    public static ContentDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public static ContentDataFilter create(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         return new ContentDataFilter(key, conditions, mustMatchAllConditions, filterOutIfKeyIsNotFound, language, currency);
     }
-    public ContentDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, Currency currency)
+    public ContentDataFilter(String key, @Nullable ValueConditionCollection conditions, Boolean mustMatchAllConditions, Boolean filterOutIfKeyIsNotFound, @Nullable Language language, @Nullable Currency currency)
     {
         this.key = key;
         this.conditions = conditions;

diff --git a/src/src/main/java/com/relewise/client/model/ContentQuery.java b/src/src/main/java/com/relewise/client/model/ContentQuery.java
@@ -42,11 +42,11 @@ public ContentQuery()
         this.language = null;
         this.currency = null;
     }
-    public static ContentQuery create(@Nullable Language language, Currency currency)
+    public static ContentQuery create(@Nullable Language language, @Nullable Currency currency)
     {
         return new ContentQuery(language, currency);
     }
-    public ContentQuery(@Nullable Language language, Currency currency)
+    public ContentQuery(@Nullable Language language, @Nullable Currency currency)
     {
         this.language = language;
         this.currency = currency;