deserialize enum from object representation

nofdev · Jul 17, 2014 · 17ae698 · 17ae698
1 parent 85be5f7
commit 17ae698
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/ServiceFacadeGrailsPlugin.groovy b/ServiceFacadeGrailsPlugin.groovy
@@ -3,7 +3,7 @@ import org.nofdev.servicefacade.grails.PagedResultListCategory
 
 class ServiceFacadeGrailsPlugin {
     // the plugin version
-    def version = "3.2.3"
+    def version = "4.2.3"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "2.1 > *"
     // resources that are excluded from plugin packaging

diff --git a/src/groovy/org/nofdev/servicefacade/grails/exporter/SimpleJSONDeserializer.groovy b/src/groovy/org/nofdev/servicefacade/grails/exporter/SimpleJSONDeserializer.groovy
@@ -34,21 +34,19 @@ class SimpleJSONDeserializer {
 
     def handelJSONPart(Object part, Type type) {
         log.trace("handelJSONPart:<$part> of type:<$type>")
-        if (part instanceof JSONElement) {
-            log.trace("instance of JSONElement")
-            handelJSONElement(part as JSONElement, type)
-        } else if (part instanceof JSONObject.Null) {
-            log.trace('element is JSONObject.Null')
-            null
-        } else if (type.enum) {
+        if (type.enum) {
             log.trace('element is an instance of enum')
             if (part instanceof String) {
+                log.trace('enum is String representation')
                 if (((String)part).trim() == "")
                     return null
                 type.valueOf(part)
-            }
-            else
+            } else if(part instanceof JSONObject) {
+                log.trace('enum is Object representation, process it with name property')
+                type.valueOf(part.name)
+            } else {
                 throw new NotSupportedException('Cannot convert to enum except String value!')
+            }
         } else if (type == DateTime) {
             log.trace('element is jodatime.DateTime')
             if (part instanceof String) {
@@ -58,6 +56,12 @@ class SimpleJSONDeserializer {
             }
             else
                 throw new NotSupportedException('Cannot convert to jodatime.DateTime except String value!')
+        } else if (part instanceof JSONElement) {
+            log.trace("instance of JSONElement")
+            handelJSONElement(part as JSONElement, type)
+        } else if (part instanceof JSONObject.Null) {
+            log.trace('element is JSONObject.Null')
+            null
         } else {
             log.trace("return $part")
             part