fix: Double

Author: piotr-blue

src/main/java/blue/language/Blue.java

@@ -80,13 +80,17 @@ public <T> T convertObject(Object object, Class<T> clazz) {
     }
 
     public boolean nodeMatchesType(Node node, Node type) {
-        return new NodeTypeMatcher(this).matchesType(node, type);
+        return new NodeTypeMatcher(this).matchesType(node, type, globalLimits);
     }
 
     public void setGlobalLimits(Limits globalLimits) {
         this.globalLimits = globalLimits != null ? globalLimits : NO_LIMITS;
     }
 
+    public Limits getGlobalLimits() {
+        return globalLimits;
+    }
+
     public Node yamlToNode(String yaml) {
         return preprocess(YAML_MAPPER.readValue(yaml, Node.class));
     }

src/main/java/blue/language/mapping/ComplexObjectConverter.java

@@ -44,6 +44,10 @@ public Object convert(Node node, Type targetType, boolean prioritizeTargetType)
             return ValueConverter.convertValue(node, classToInstantiate);
         }
 
+        if (resolvedClass != null && getRawType(targetType).isAssignableFrom(resolvedClass)) {
+            classToInstantiate = resolvedClass;
+        }
+
         try {
             Object instance = classToInstantiate.getDeclaredConstructor().newInstance();
             convertFields(node, classToInstantiate, instance);

src/main/java/blue/language/model/Constraints.java

@@ -11,7 +11,7 @@
 
 import static blue.language.utils.TypeUtils.*;
 
-public class Constraints {
+public class Constraints implements Cloneable {
 
     private Node required;
     private Node allowMultiple;
@@ -288,6 +288,41 @@ public Constraints uniqueItems(Boolean uniqueItems) {
         return this;
     }
 
+    @Override
+    public Constraints clone() {
+        try {
+            Constraints cloned = (Constraints) super.clone();
+
+            if (this.required != null) cloned.required = this.required.clone();
+            if (this.allowMultiple != null) cloned.allowMultiple = this.allowMultiple.clone();
+            if (this.minLength != null) cloned.minLength = this.minLength.clone();
+            if (this.maxLength != null) cloned.maxLength = this.maxLength.clone();
+            if (this.minimum != null) cloned.minimum = this.minimum.clone();
+            if (this.maximum != null) cloned.maximum = this.maximum.clone();
+            if (this.exclusiveMinimum != null) cloned.exclusiveMinimum = this.exclusiveMinimum.clone();
+            if (this.exclusiveMaximum != null) cloned.exclusiveMaximum = this.exclusiveMaximum.clone();
+            if (this.multipleOf != null) cloned.multipleOf = this.multipleOf.clone();
+            if (this.minItems != null) cloned.minItems = this.minItems.clone();
+            if (this.maxItems != null) cloned.maxItems = this.maxItems.clone();
+            if (this.uniqueItems != null) cloned.uniqueItems = this.uniqueItems.clone();
+
+            if (this.pattern != null) {
+                cloned.pattern = this.pattern.stream()
+                        .map(Node::clone)
+                        .collect(Collectors.toList());
+            }
+            if (this.options != null) {
+                cloned.options = this.options.stream()
+                        .map(Node::clone)
+                        .collect(Collectors.toList());
+            }
+
+            return cloned;
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError("Constraints must be cloneable", e);
+        }
+    }
+
     @Override
     public String toString() {
         return "Constraints{" +

src/main/java/blue/language/model/Node.java

@@ -262,8 +262,7 @@ public Integer getAsInteger(String path) {
         }
     }
 
-    @Override
-    public Node clone() {
+    public Node clone2() {
         try {
             Node cloned = (Node) super.clone();
             if (this.type != null) {
@@ -300,6 +299,61 @@ public Node clone() {
         }
     }
 
+    @Override
+    public Node clone() {
+        try {
+            Node cloned = (Node) super.clone();
+
+            cloned.name = this.name;
+            cloned.description = this.description;
+            cloned.value = this.value;
+
+            if (this.type != null) {
+                cloned.type = this.type.clone();
+            }
+
+            if (this.itemType != null) {
+                cloned.itemType = this.itemType.clone();
+            }
+
+            if (this.keyType != null) {
+                cloned.keyType = this.keyType.clone();
+            }
+
+            if (this.valueType != null) {
+                cloned.valueType = this.valueType.clone();
+            }
+
+            if (this.items != null) {
+                cloned.items = this.items.stream()
+                        .map(Node::clone)
+                        .collect(Collectors.toCollection(ArrayList::new));
+            }
+
+            if (this.properties != null) {
+                cloned.properties = this.properties.entrySet().stream()
+                        .collect(Collectors.toMap(
+                                Map.Entry::getKey,
+                                entry -> entry.getValue().clone(),
+                                (e1, e2) -> e1,
+                                HashMap::new
+                        ));
+            }
+
+            if (this.constraints != null) {
+                cloned.constraints = this.constraints.clone();
+            }
+
+            if (this.blue != null) {
+                cloned.blue = this.blue.clone();
+            }
+
+            return cloned;
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError("Node must be cloneable", e);
+        }
+    }
+
     @Override
     public String toString() {
         return "Node{" +

src/main/java/blue/language/preprocess/Preprocessor.java

@@ -18,7 +18,7 @@
 
 public class Preprocessor {
 
-    public static final String DEFAULT_BLUE_BLUE_ID = "5y7V3sYaj72uet7gc3WFjADBUhFe4bGWzQtmZ8v3wr8z";
+    public static final String DEFAULT_BLUE_BLUE_ID = "8Na7RPBKK2rkDR1iUBhMjmUg5BAku3YfihLCeN3SYcuD";
 
     private TransformationProcessorProvider processorProvider;
     private NodeProvider nodeProvider;

src/main/resources/transformation/DefaultBlue.blue

@@ -2,7 +2,7 @@
     blueId: 648mybP3oHoi8kx6HvYzw6Jtuz6BjUpGPk1r2DpCq7e4
   mappings:
     Text: F92yo19rCcbBoBSpUA5LRxpfDejJDAaP1PRxxbWAraVP
-    Number: 68ryJtnmui4j5rCZWUnkZ3DChtmEb7Z9F8atn1mBSM3L
+    Double: 68ryJtnmui4j5rCZWUnkZ3DChtmEb7Z9F8atn1mBSM3L
     Integer: DHmxTkFbXePZHCHCYmQr2dSzcNLcryFVjXVHkdQrrZr8
     Boolean: EL6AjrbJsxTWRTPzY8WR8Y2zAMXRbydQj83PcZwuAHbo
     List: G8wmfjEqugPEEXByMYWJXiEdbLToPRWNQEekNxrxfQWB

src/test/java/blue/language/mapping/NodeToObjectConverterTest.java

@@ -6,6 +6,7 @@
 import blue.language.utils.BlueIdCalculator;
 import blue.language.utils.Properties;
 import blue.language.utils.TypeClassResolver;
+import blue.language.utils.UncheckedObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -760,4 +761,27 @@ public void testXSubscriptionConversion() throws Exception {
         assertEquals(Integer.valueOf(5), subscription2.getSubscriptionId());
     }
 
+    @Test
+    public void testObjectSimple() throws Exception {
+        String personTestDataYaml = "type:\n" +
+                                    "  blueId: Nurse-BlueId\n" +
+                                    "name: Alice\n" +
+                                    "surname: Smith\n" +
+                                    "age: 25\n" +
+                                    "yearsOfExperience: 4";
+
+        Node node = blue.yamlToNode(personTestDataYaml);
+
+        Person data = converter.convert(node, Person.class);
+
+        assertNotNull(data);
+
+        assertInstanceOf(Nurse.class, data);
+        Nurse nurse = (Nurse) data;
+        assertEquals("Alice", nurse.getName());
+        assertEquals("Smith", nurse.getSurname());
+        assertEquals(Integer.valueOf(25), nurse.getAge());
+        assertEquals(Integer.valueOf(4), nurse.yearsOfExperience);
+    }
+
 }