From 27b3c746bf4c332a3171374eb6c479c53da6327d Mon Sep 17 00:00:00 2001 From: Georgie Date: Tue, 22 Sep 2015 23:28:58 -0700 Subject: [PATCH 1/2] NumberSchema#multipleOf --- .../module/jsonSchema/types/NumberSchema.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java b/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java index 8c572016..15397e27 100644 --- a/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java +++ b/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java @@ -29,11 +29,15 @@ public class NumberSchema extends ValueTypeSchema /**This attribute defines the maximum value of the instance property*/ @JsonProperty private Double maximum = null; - + /**This attribute defines the minimum value of the instance property*/ @JsonProperty private Double minimum = null; + /** The value of the instance needs to be a multiple of this attribute */ + @JsonProperty + private Double multipleOf = null; + @Override public NumberSchema asNumberSchema() { return this; } @@ -52,6 +56,10 @@ public Double getMaximum() { public Double getMinimum() { return minimum; } + + public Double getMultipleOf() { + return multipleOf; + } /* (non-Javadoc) * @see com.fasterxml.jackson.databind.jsonSchema.types.JsonSchema#getType() @@ -81,6 +89,10 @@ public void setMinimum(Double minimum) { this.minimum = minimum; } + public void setMultipleOf(Double multipleOf) { + this.multipleOf = multipleOf; + } + @Override public boolean equals(Object obj) { @@ -97,6 +109,5 @@ protected boolean _equals(NumberSchema that) equals(getMaximum(), that.getMaximum()) && equals(getMinimum(), that.getMinimum()) && super._equals(that); - } - + } } From 0b8c8317e1bd5b673ddd23ac0c61af58f062451f Mon Sep 17 00:00:00 2001 From: Georgie Date: Tue, 22 Sep 2015 23:40:11 -0700 Subject: [PATCH 2/2] Include multipleOf in equals --- .../fasterxml/jackson/module/jsonSchema/types/NumberSchema.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java b/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java index 15397e27..b42d35d3 100644 --- a/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java +++ b/src/main/java/com/fasterxml/jackson/module/jsonSchema/types/NumberSchema.java @@ -108,6 +108,7 @@ protected boolean _equals(NumberSchema that) equals(getExclusiveMinimum(), that.getExclusiveMinimum()) && equals(getMaximum(), that.getMaximum()) && equals(getMinimum(), that.getMinimum()) && + equals(getMultipleOf(), that.getMultipleOf()) && super._equals(that); } }