Repository: zest-java Updated Branches: refs/heads/develop 61427b8a1 -> 3e2fdc9bd
ZEST-142 : Fixed the problem with Enums in Property in EntityComposites. Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/3e2fdc9b Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/3e2fdc9b Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/3e2fdc9b Branch: refs/heads/develop Commit: 3e2fdc9bd1b8663ec3a9a33a55bbecf39d4c370a Parents: 61427b8 Author: Niclas Hedhman <[email protected]> Authored: Fri Apr 15 17:32:41 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Fri Apr 15 17:32:41 2016 +0800 ---------------------------------------------------------------------- .../apache/zest/spi/value/ValueDeserializerAdapter.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/3e2fdc9b/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java ---------------------------------------------------------------------- diff --git a/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java b/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java index 06ea286..b46c27a 100644 --- a/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java +++ b/core/spi/src/main/java/org/apache/zest/spi/value/ValueDeserializerAdapter.java @@ -291,6 +291,16 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType> String string = scanner.next(); return (T) deserializeBase64Serialized( module, string ); } + else if( type.isEnum() ) + { + Scanner scanner = new Scanner( input, UTF_8 ).useDelimiter( "\\A" ); + if( !scanner.hasNext() ) + { + return String.class.equals( type ) ? (T) "" : null; + } + String string = scanner.next(); + return (T) Enum.valueOf( (Class) type, string ); + } else // Complex ValueType { InputType adaptedInput = adaptInput( module, input );
