Skip to content

Commit

Permalink
Fix #104
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed May 10, 2016
1 parent 192feb6 commit 110330e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
5 changes: 5 additions & 0 deletions release-notes/CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,8 @@ Jakub Neubauer (jakubneubauer@github)

#77: Schema with enum array - when deserialized, the enum values are lost
(2.7.0)

alexpeelman@github

#104: HyperSchema does not generate links for nested objects
(2.7.5)
5 changes: 5 additions & 0 deletions release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Project: jackson-module-jsonSchema
=== Releases ===
------------------------------------------------------------------------

2.7.5 (not yet released)

#104: HyperSchema does not generate links for nested objects
(reported by alexpeelman@github)

2.7.4 (29-Apr-2016)
2.7.3 (16-Mar-2016)
2.7.2 (26-Feb-2016)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,25 @@ public class HyperSchemaFactoryWrapper extends SchemaFactoryWrapper {
private static class HyperSchemaFactoryWrapperFactory extends WrapperFactory {
@Override
public SchemaFactoryWrapper getWrapper(SerializerProvider p) {
SchemaFactoryWrapper wrapper = new HyperSchemaFactoryWrapper();
wrapper.setProvider(p);
return wrapper;
return new HyperSchemaFactoryWrapper(p);
};

@Override
public SchemaFactoryWrapper getWrapper(SerializerProvider p, VisitorContext rvc)
{
return new HyperSchemaFactoryWrapper(p)
.setVisitorContext(rvc);
}
};

public HyperSchemaFactoryWrapper() {
super(new HyperSchemaFactoryWrapperFactory());
}

public HyperSchemaFactoryWrapper(SerializerProvider p) {
super(p, new HyperSchemaFactoryWrapperFactory());
}

@Override
public JsonObjectFormatVisitor expectObjectFormat(JavaType convertedType) {
ObjectVisitor visitor = ((ObjectVisitor)super.expectObjectFormat(convertedType));
Expand Down Expand Up @@ -117,5 +126,4 @@ private JsonSchema fetchSchema(Class<?> targetSchema) {
}
return null;
}

}

0 comments on commit 110330e

Please sign in to comment.