Skip to content

Commit b19428b

Browse files
committed
Completed cleanup for #81; removed custom (de)serializer after adding proper ser/deser for JsonValueFormat in databind, for 2.7
1 parent 7c4ec6d commit b19428b

File tree

4 files changed

+7
-51
lines changed

4 files changed

+7
-51
lines changed

release-notes/VERSION

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Project: jackson-module-jsonSchema
88

99
#80: Support NumberFormat#multipleOf
1010
(contributed by George F)
11+
#81: Deserialize `ArrayItems` and `JsonValueFormat` correctly
12+
(contributed by George F)
1113

1214
2.6.2 (15-Sep-2015)
1315

src/main/java/com/fasterxml/jackson/module/jsonSchema/types/JsonValueFormatDeserializer.java

-25
This file was deleted.

src/main/java/com/fasterxml/jackson/module/jsonSchema/types/JsonValueFormatSerializer.java

-19
This file was deleted.

src/main/java/com/fasterxml/jackson/module/jsonSchema/types/ValueTypeSchema.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package com.fasterxml.jackson.module.jsonSchema.types;
22

3+
import java.util.*;
4+
35
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
5-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
66
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonValueFormat;
77
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
88

9-
import java.util.LinkedHashSet;
10-
import java.util.Set;
11-
129
/**
1310
* This class represents a {@link JsonSchema}
1411
* A primitive type.
@@ -38,10 +35,11 @@ of enum values uses the same algorithm as defined in "uniqueItems"
3835
*
3936
* Additional custom formats MAY be created. These custom formats MAY be
4037
* expressed as an URI, and this URI MAY reference a schema of that
38+
*<p>
39+
* NOTE: serialization of `format` was fixed in Jackson 2.7; requires at least
40+
* this version of databind
4141
*/
4242
@JsonProperty
43-
@JsonDeserialize(using = JsonValueFormatDeserializer.class)
44-
@JsonSerialize(using = JsonValueFormatSerializer.class)
4543
protected JsonValueFormat format;
4644

4745
/**

0 commit comments

Comments
 (0)