diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/QBackendMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/QBackendMetaData.java index f1b5980d..ef534824 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/QBackendMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/QBackendMetaData.java @@ -43,8 +43,8 @@ public class QBackendMetaData private String name; private String backendType; - private boolean usesVariants = false; - private String variantsOptionTableName; + private Boolean usesVariants = false; + private String variantOptionsTableName; private Set enabledCapabilities = new HashSet<>(); private Set disabledCapabilities = new HashSet<>(); @@ -352,7 +352,7 @@ public class QBackendMetaData /******************************************************************************* ** Getter for usesVariants *******************************************************************************/ - public boolean getUsesVariants() + public Boolean getUsesVariants() { return (this.usesVariants); } @@ -362,7 +362,7 @@ public class QBackendMetaData /******************************************************************************* ** Setter for usesVariants *******************************************************************************/ - public void setUsesVariants(boolean usesVariants) + public void setUsesVariants(Boolean usesVariants) { this.usesVariants = usesVariants; } @@ -372,7 +372,7 @@ public class QBackendMetaData /******************************************************************************* ** Fluent setter for usesVariants *******************************************************************************/ - public QBackendMetaData withUsesVariants(boolean usesVariants) + public QBackendMetaData withUsesVariants(Boolean usesVariants) { this.usesVariants = usesVariants; return (this); @@ -383,9 +383,9 @@ public class QBackendMetaData /******************************************************************************* ** Getter for variantsOptionTableName *******************************************************************************/ - public String getVariantsOptionTableName() + public String getVariantOptionsTableName() { - return (this.variantsOptionTableName); + return (this.variantOptionsTableName); } @@ -393,9 +393,9 @@ public class QBackendMetaData /******************************************************************************* ** Setter for variantsOptionTableName *******************************************************************************/ - public void setVariantsOptionTableName(String variantsOptionTableName) + public void setVariantOptionsTableName(String variantOptionsTableName) { - this.variantsOptionTableName = variantsOptionTableName; + this.variantOptionsTableName = variantOptionsTableName; } @@ -405,7 +405,7 @@ public class QBackendMetaData *******************************************************************************/ public QBackendMetaData withVariantsOptionTableName(String variantsOptionTableName) { - this.variantsOptionTableName = variantsOptionTableName; + this.variantOptionsTableName = variantsOptionTableName; return (this); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java index e00103c7..b6e79026 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java @@ -37,6 +37,7 @@ import java.util.function.Consumer; import com.fasterxml.jackson.core.TreeNode; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.BooleanNode; import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; @@ -283,6 +284,10 @@ public class DeserializerUtils { setterMap.get(fieldName).accept(textNode.asText()); } + else if(fieldNode instanceof BooleanNode booleanNode) + { + setterMap.get(fieldName).accept(booleanNode); + } else if(fieldNode instanceof ObjectNode) { setterMap.get(fieldName).accept(fieldNode);