Merge pull request #20 from Relewise/feature/added-support-for-non-re…

…adonly-structs Added support for generating classes from non-readonly structs.
Relewise · Sep 12, 2024 · 499c6e1 · 499c6e1
2 parents b54ea3c + 4de5f02
commit 499c6e1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 263 deletions.
diff --git a/Generator/JavaTypeWriters/JavaClassWriter.cs b/Generator/JavaTypeWriters/JavaClassWriter.cs
@@ -17,12 +17,14 @@ public JavaClassWriter(JavaWriter javaWriter)
         this.javaWriter = javaWriter;
     }
 
-    public bool CanWrite(Type type) => IsClass(type) || IsReadonlyStruct(type);
+    public bool CanWrite(Type type) => IsClass(type) || IsAnyStruct(type);
 
     private bool IsClass(Type type) => type.IsClass;
 
     private bool IsReadonlyStruct(Type type) => type.IsValueType && type.GetProperties().All(p => !p.CanWrite);
 
+    private bool IsAnyStruct(Type type) => type.IsValueType;
+
     public void Write(IndentedTextWriter writer, Type type, string typeName)
     {
         writer.WriteLine($"""
@@ -123,16 +125,7 @@ public void Write(IndentedTextWriter writer, Type type, string typeName)
             .Select(MapPropertyInfo)
             .ToArray();
 
-        if (IsClass(type))
-        {
-            javaWriter.SettablePropertiesWriter.Write(writer, type, ownedProperties);
-            javaWriter.StaticReadonlyPropertiesWriter.Write(writer, type, staticGetterProperties);
-
-            javaWriter.CreatorMethodWriter.Write(writer, type, typeName, settableProperties);
-            javaWriter.PropertyGetterMethodsWriter.Write(writer, type, ownedProperties);
-            javaWriter.PropertySetterMethodsWriter.Write(writer, type, typeName, settableProperties, ownedProperties.Select(p => p.propertyName).ToArray());
-        }
-        else if (IsReadonlyStruct(type))
+        if (IsReadonlyStruct(type))
         {
             javaWriter.SettablePropertiesWriter.Write(writer, type, gettableProperties);
             javaWriter.StaticReadonlyPropertiesWriter.Write(writer, type, staticGetterProperties);
@@ -141,6 +134,15 @@ public void Write(IndentedTextWriter writer, Type type, string typeName)
             javaWriter.PropertyGetterMethodsWriter.Write(writer, type, gettableProperties);
             javaWriter.PropertySetterMethodsWriter.Write(writer, type, typeName, gettableProperties, gettableProperties.Select(p => p.propertyName).ToArray());
         }
+        else if (IsClass(type) || IsAnyStruct(type))
+        {
+            javaWriter.SettablePropertiesWriter.Write(writer, type, ownedProperties);
+            javaWriter.StaticReadonlyPropertiesWriter.Write(writer, type, staticGetterProperties);
+
+            javaWriter.CreatorMethodWriter.Write(writer, type, typeName, settableProperties);
+            javaWriter.PropertyGetterMethodsWriter.Write(writer, type, ownedProperties);
+            javaWriter.PropertySetterMethodsWriter.Write(writer, type, typeName, settableProperties, ownedProperties.Select(p => p.propertyName).ToArray());
+        }
 
         writer.Indent--;
         writer.WriteLine("}");

diff --git a/src/src/main/java/com/relewise/client/model/EntitiesRequest.java b/src/src/main/java/com/relewise/client/model/EntitiesRequest.java
diff --git a/src/src/main/java/com/relewise/client/model/EntityChangeTriggerConfiguration.java b/src/src/main/java/com/relewise/client/model/EntityChangeTriggerConfiguration.java