From a5809829e89ea42665396a628ea277d253ef9fa1 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 03 Nov 2016 10:18:29 +0000
Subject: [PATCH] Do not put JsonValue inside JSON schemas
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Resource.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Resource.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Resource.java
index 8e8b3d3..9c8fbd0 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Resource.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Resource.java
@@ -857,7 +857,7 @@
}
final JsonValue jsonSchema = mapper.toJsonSchema();
if (jsonSchema != null) {
- properties.put(propertyName, jsonSchema);
+ properties.put(propertyName, jsonSchema.getObject());
}
}
@@ -870,14 +870,14 @@
jsonSchema.put("required", requiredFields);
}
if (properties.size() > 0) {
- jsonSchema.put("properties", properties);
+ jsonSchema.put("properties", properties.getObject());
}
if (superType != null) {
return schema(json(object(
field("allOf", array(
object(field("$ref", "#/definitions/" + superType.id)),
- jsonSchema)))));
+ jsonSchema.getObject())))));
}
return schema(jsonSchema);
}
--
Gitblit v1.10.0