Add a fromJsonString to ModelValue.

gatein · Apr 1, 2013 · 49957bc · 49957bc
1 parent 5df0c64
commit 49957bc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/api/src/main/java/org/gatein/management/api/model/ModelValue.java b/api/src/main/java/org/gatein/management/api/model/ModelValue.java
@@ -56,6 +56,10 @@ public enum ModelValueType
 
    String toJsonString(boolean pretty);
 
+   ModelValue fromJsonString(String json);
+
+   <T extends ModelValue> T fromJsonString(String json, Class<T> valueType);
+
    void toJsonStream(OutputStream outputStream, boolean pretty) throws IOException;
 
    ModelValue fromJsonStream(InputStream inputStream) throws IOException;

diff --git a/core/src/main/java/org/gatein/management/core/api/model/DmrModelValue.java b/core/src/main/java/org/gatein/management/core/api/model/DmrModelValue.java
@@ -144,6 +144,18 @@ private void toJson(PrintWriter writer, boolean pretty)
       writer.flush();
    }
 
+   @Override
+   public ModelValue fromJsonString(String json)
+   {
+      return readFromJsonString(json);
+   }
+
+   @Override
+   public <T extends ModelValue> T fromJsonString(String json, Class<T> valueType)
+   {
+      return readFromJsonString(json, valueType);
+   }
+
    @Override
    public ModelValue fromJsonStream(InputStream inputStream) throws IOException
    {
@@ -173,6 +185,16 @@ public static <T extends ModelValue> T readFromJsonStream(InputStream inputStrea
       return valueType.cast(readFromJsonStream(inputStream));
    }
 
+   public static ModelValue readFromJsonString(String json)
+   {
+      return asValue(ModelNode.fromJSONString(json));
+   }
+
+   public static <T extends ModelValue> T readFromJsonString(String json, Class<T> valueType)
+   {
+      return valueType.cast(readFromJsonString(json));
+   }
+
    public static Model newModel()
    {
       return new DmrModel(new ModelNode());