Merge pull request #1078 from hypar-io/no-allow-null

remove all instances of Required.AllowNull
hypar-io · Mar 4, 2024 · a5e8195 · a5e8195
2 parents 2e7592e + 12e0841
commit a5e8195
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/Elements/src/CoreModels/RepresentationInstance.cs b/Elements/src/CoreModels/RepresentationInstance.cs
@@ -43,7 +43,7 @@ public RepresentationInstance(ElementRepresentation representation, Material mat
         /// <summary>
         /// The representation's material.
         /// </summary>
-        [JsonProperty("Material", Required = Required.AllowNull)]
+        [JsonProperty("Material")]
         public Material Material { get; set; }
 
         /// <summary>

diff --git a/Elements/src/GeometricElement.cs b/Elements/src/GeometricElement.cs
@@ -39,15 +39,15 @@ public class GeometricElement : Element
         public BBox3 Bounds => _bounds;
 
         /// <summary>The element's transform.</summary>
-        [JsonProperty("Transform", Required = Required.AllowNull)]
+        [JsonProperty("Transform")]
         public Transform Transform { get; set; }
 
         /// <summary>The element's material.</summary>
-        [JsonProperty("Material", Required = Required.AllowNull)]
+        [JsonProperty("Material")]
         public Material Material { get; set; }
 
         /// <summary>The element's representation.</summary>
-        [JsonProperty("Representation", Required = Required.AllowNull)]
+        [JsonProperty("Representation")]
         public Representation Representation { get; set; }
 
         /// <summary>
@@ -57,7 +57,7 @@ public class GeometricElement : Element
         public List<RepresentationInstance> RepresentationInstances { get; set; } = new List<RepresentationInstance>();
 
         /// <summary>When true, this element will act as the base definition for element instances, and will not appear in visual output.</summary>
-        [JsonProperty("IsElementDefinition", Required = Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [JsonProperty("IsElementDefinition", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public bool IsElementDefinition { get; set; } = false;
 
         /// <summary>

diff --git a/Elements/src/Geometry/Circle.cs b/Elements/src/Geometry/Circle.cs
@@ -13,7 +13,7 @@ namespace Elements.Geometry
     public class Circle : Curve, IConic
     {
         /// <summary>The center of the circle.</summary>
-        [JsonProperty("Center", Required = Required.AllowNull)]
+        [JsonProperty("Center", Required = Required.Always)]
         public Vector3 Center
         {
             get

diff --git a/Elements/src/Geometry/Plane.cs b/Elements/src/Geometry/Plane.cs
@@ -11,11 +11,11 @@ namespace Elements.Geometry
     public partial class Plane : IEquatable<Plane>
     {
         /// <summary>The origin of the plane.</summary>
-        [JsonProperty("Origin", Required = Required.AllowNull)]
+        [JsonProperty("Origin", Required = Required.Always)]
         public Vector3 Origin { get; set; }
 
         /// <summary>The normal of the plane.</summary>
-        [JsonProperty("Normal", Required = Required.AllowNull)]
+        [JsonProperty("Normal", Required = Required.Always)]
         public Vector3 Normal { get; set; }
 
         /// <summary>

diff --git a/Elements/src/Geometry/Profile.cs b/Elements/src/Geometry/Profile.cs
@@ -13,11 +13,11 @@ namespace Elements.Geometry
     public class Profile : Element, IEquatable<Profile>
     {
         /// <summary>The perimeter of the profile.</summary>
-        [JsonProperty("Perimeter", Required = Required.AllowNull)]
+        [JsonProperty("Perimeter", Required = Required.Always)]
         public Polygon Perimeter { get; set; }
 
         /// <summary>A collection of Polygons representing voids in the profile.</summary>
-        [JsonProperty("Voids", Required = Required.AllowNull)]
+        [JsonProperty("Voids")]
         public IList<Polygon> Voids { get; set; }
 
         /// <summary>

diff --git a/Elements/src/Geometry/Solids/Extrude.cs b/Elements/src/Geometry/Solids/Extrude.cs
@@ -16,7 +16,7 @@ public class Extrude : SolidOperation, System.ComponentModel.INotifyPropertyChan
         private bool _reverseWinding;
 
         /// <summary>The id of the profile to extrude.</summary>
-        [JsonProperty("Profile", Required = Required.AllowNull)]
+        [JsonProperty("Profile", Required = Required.Always)]
         public Profile Profile
         {
             get { return _profile; }
@@ -47,7 +47,7 @@ public double Height
         }
 
         /// <summary>The direction in which to extrude.</summary>
-        [JsonProperty("Direction", Required = Required.AllowNull)]
+        [JsonProperty("Direction", Required = Required.Always)]
         public Vector3 Direction
         {
             get { return _direction; }

diff --git a/Elements/src/Geometry/Solids/Lamina.cs b/Elements/src/Geometry/Solids/Lamina.cs
@@ -12,7 +12,7 @@ public class Lamina : SolidOperation
         private IList<Polygon> _voids;
 
         /// <summary>The perimeter.</summary>
-        [JsonProperty("Perimeter", Required = Required.AllowNull)]
+        [JsonProperty("Perimeter", Required = Required.Always)]
         public Polygon Perimeter
         {
             get { return _perimeter; }
@@ -29,7 +29,7 @@ public Polygon Perimeter
         /// <summary>
         /// A collection of voids.
         /// </summary>
-        [JsonProperty("Voids", Required = Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [JsonProperty("Voids", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public IList<Polygon> Voids
         {
             get { return _voids; }

diff --git a/Elements/src/Geometry/Triangle.cs b/Elements/src/Geometry/Triangle.cs
@@ -17,7 +17,7 @@ public class Triangle
         public IList<Vertex> Vertices { get; set; } = new List<Vertex>();
 
         /// <summary>The triangle's normal.</summary>
-        [JsonProperty("Normal", Required = Required.AllowNull)]
+        [JsonProperty("Normal")]
         public Vector3 Normal { get; set; }
 
         /// <summary>

diff --git a/Elements/src/Geometry/Vertex.cs b/Elements/src/Geometry/Vertex.cs
@@ -9,11 +9,11 @@ namespace Elements.Geometry
     public class Vertex
     {
         /// <summary>The vertex's position.</summary>
-        [JsonProperty("Position", Required = Required.AllowNull)]
+        [JsonProperty("Position", Required = Required.Always)]
         public Vector3 Position { get; set; }
 
         /// <summary>The vertex's normal.</summary>
-        [JsonProperty("Normal", Required = Required.AllowNull)]
+        [JsonProperty("Normal")]
         public Vector3 Normal { get; set; }
 
         /// <summary>The vertex's color.</summary>

diff --git a/Elements/src/Model.cs b/Elements/src/Model.cs
@@ -22,12 +22,12 @@ namespace Elements
     public class Model
     {
         /// <summary>The origin of the model.</summary>
-        [JsonProperty("Origin", Required = Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [JsonProperty("Origin", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Obsolete("Use Transform instead.")]
         public Position Origin { get; set; }
 
         /// <summary>The transform of the model.</summary>
-        [JsonProperty("Transform", Required = Required.AllowNull)]
+        [JsonProperty("Transform")]
         public Transform Transform { get; set; }
 
         /// <summary>A collection of Elements keyed by their identifiers.</summary>