[JOHNZON-387] ensure ref has enclosing name
diff --git a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
index 7625a2f..7f058ad 100644
--- a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
+++ b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
@@ -209,7 +209,8 @@
protected String asType(final String javaName, final JsonObject schema, final boolean required) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
- final String name = onRef(new Ref(JsonString.class.cast(ref).getString(), imports, attributes, nested));
+ final String name = onRef(new Ref(
+ JsonString.class.cast(ref).getString(), configuration.getClassName(), imports, attributes, nested));
if (name != null) {
return name;
}
@@ -441,7 +442,9 @@
protected String onItemSchema(final String javaName, final JsonObject schema) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
- final String name = onRef(new Ref(JsonString.class.cast(ref).getString(), imports, attributes, nested));
+ final String name = onRef(new Ref(
+ configuration.getClassName(),
+ JsonString.class.cast(ref).getString(), imports, attributes, nested));
if (name != null) {
return name;
}
@@ -659,18 +662,24 @@
public static class Ref {
private final String ref;
+ private final String enclosingClass;
private final Set<String> imports;
private final List<Attribute> attributes;
private final Map<String, String> nested;
- private Ref(final String ref, final Set<String> imports,
+ private Ref(final String ref, final String enclosingClass, final Set<String> imports,
final List<Attribute> attributes, final Map<String, String> nested) {
this.ref = ref;
+ this.enclosingClass = enclosingClass;
this.imports = imports;
this.attributes = attributes;
this.nested = nested;
}
+ public String getEnclosingClass() {
+ return enclosingClass;
+ }
+
public String getRef() {
return ref;
}
