From 602e3521b45e808638640f69cce3e412ba447a5d Mon Sep 17 00:00:00 2001
From: Greg Burd <gburd@onshape.com>
Date: Wed, 16 Aug 2017 13:43:46 -0400
Subject: [PATCH] Values return to the client in a proxy object should be
 converted to the proper type.

---
 pom.xml                                                |  2 +-
 .../net/helenus/core/operation/InsertOperation.java    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7be0cc1..90b9ef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.helenus</groupId>
     <artifactId>helenus-core</artifactId>
-    <version>2.0.19-SNAPSHOT</version>
+    <version>2.0.20-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>helenus</name>
diff --git a/src/main/java/net/helenus/core/operation/InsertOperation.java b/src/main/java/net/helenus/core/operation/InsertOperation.java
index e6220ad..602696c 100644
--- a/src/main/java/net/helenus/core/operation/InsertOperation.java
+++ b/src/main/java/net/helenus/core/operation/InsertOperation.java
@@ -34,6 +34,7 @@ import net.helenus.support.HelenusException;
 import net.helenus.support.HelenusMappingException;
 
 import java.util.*;
+import java.util.function.Function;
 
 public final class InsertOperation<T> extends AbstractOperation<T, InsertOperation<T>> {
 
@@ -153,7 +154,14 @@ public final class InsertOperation<T> extends AbstractOperation<T, InsertOperati
                 // Then, fill in all the rest of the properties.
                 for (HelenusProperty prop : properties) {
                     String key = prop.getPropertyName();
-                    if (!backingMap.containsKey(key)) {
+                    if (backingMap.containsKey(key)) {
+                        // Some values man need to be converted (e.g. from String to Enum).  This is done
+                        // within the BeanColumnValueProvider below.
+                        Optional<Function<Object, Object>> converter = prop.getReadConverter(sessionOps.getSessionRepository());
+                        if (converter.isPresent()) {
+                            backingMap.put(key, converter.get().apply(backingMap.get(key)));
+                        }
+                    } else {
                         // If we started this operation with an instance of this type, use values from that.
                         if (pojo != null) {
                             backingMap.put(key, BeanColumnValueProvider.INSTANCE.getColumnValue(pojo, -1, prop));