Change JsonBinarySqlTypeDescriptor to bind the JSON object as String #…

…423
vladmihalcea · Apr 10, 2022 · a2f92c0 · a2f92c0
1 parent e976235
commit a2f92c0
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 27 deletions.
diff --git a/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java b/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java
@@ -1,12 +1,10 @@
 package com.vladmihalcea.hibernate.type.json.internal;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
 import org.hibernate.type.descriptor.sql.BasicBinder;
 
-import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
@@ -22,7 +20,7 @@ public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescript
         return new BasicBinder<X>(javaTypeDescriptor, this) {
             @Override
             protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-                st.setObject(index, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(index, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
         };
     }

diff --git a/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java b/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java
@@ -1,12 +1,10 @@
 package com.vladmihalcea.hibernate.type.json.internal;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
 import org.hibernate.type.descriptor.sql.BasicBinder;
 
-import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
@@ -22,7 +20,7 @@ public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescript
         return new BasicBinder<X>(javaTypeDescriptor, this) {
             @Override
             protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-                st.setObject(index, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(index, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
         };
     }

diff --git a/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java b/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.json.internal;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
@@ -22,13 +21,13 @@ public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescript
         return new BasicBinder<X>(javaTypeDescriptor, this) {
             @Override
             protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-                st.setObject(index, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(index, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
 
             @Override
             protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
                     throws SQLException {
-                st.setObject(name, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(name, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
         };
     }

diff --git a/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java b/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.json.internal;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
@@ -22,13 +21,13 @@ public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescript
         return new BasicBinder<X>(javaTypeDescriptor, this) {
             @Override
             protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-                st.setObject(index, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(index, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
 
             @Override
             protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
                     throws SQLException {
-                st.setObject(name, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(name, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
         };
     }

diff --git a/.../src/test/java/com/vladmihalcea/hibernate/type/json/PostgreSQLJsonStringPropertyTest.java b/.../src/test/java/com/vladmihalcea/hibernate/type/json/PostgreSQLJsonStringPropertyTest.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.json;
 
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.vladmihalcea.hibernate.util.AbstractPostgreSQLIntegrationTest;
 import com.vladmihalcea.hibernate.util.ExceptionUtil;
@@ -152,8 +151,8 @@ public void testInvalidJson() {
             });
             fail("An invalid JSON should throw an exception!");
         } catch (Exception e) {
-            JsonParseException rootCause = ExceptionUtil.rootCause(e);
-            assertTrue(rootCause.getMessage().contains("Unexpected character (':'"));
+            Exception rootCause = ExceptionUtil.rootCause(e);
+            assertTrue(rootCause.getMessage().contains("invalid input syntax for type json"));
         }
     }
 

diff --git a/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java b/.../main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinarySqlTypeDescriptor.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.json.internal;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
@@ -22,13 +21,13 @@ public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescript
         return new BasicBinder<X>(javaTypeDescriptor, this) {
             @Override
             protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-                st.setObject(index, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(index, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
 
             @Override
             protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
                     throws SQLException {
-                st.setObject(name, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
+                st.setObject(name, javaTypeDescriptor.unwrap(value, String.class, options), getSqlType());
             }
         };
     }

diff --git a/.../src/test/java/com/vladmihalcea/hibernate/type/json/PostgreSQLJsonStringPropertyTest.java b/.../src/test/java/com/vladmihalcea/hibernate/type/json/PostgreSQLJsonStringPropertyTest.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.json;
 
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.vladmihalcea.hibernate.util.AbstractPostgreSQLIntegrationTest;
 import com.vladmihalcea.hibernate.util.ExceptionUtil;
@@ -152,8 +151,8 @@ public void testInvalidJson() {
             });
             fail("An invalid JSON should throw an exception!");
         } catch (Exception e) {
-            JsonParseException rootCause = ExceptionUtil.rootCause(e);
-            assertTrue(rootCause.getMessage().contains("Unexpected character (':'"));
+            Exception rootCause = ExceptionUtil.rootCause(e);
+            assertTrue(rootCause.getMessage().contains("invalid input syntax for type json"));
         }
     }
 

diff --git a/...main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinaryJdbcTypeDescriptor.java b/...main/java/com/vladmihalcea/hibernate/type/json/internal/JsonBinaryJdbcTypeDescriptor.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.json.internal;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -22,13 +21,13 @@ public <X> ValueBinder<X> getBinder(final JavaType<X> javaType) {
         return new BasicBinder<X>(javaType, this) {
             @Override
             protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-                st.setObject(index, javaType.unwrap(value, JsonNode.class, options), getJdbcTypeCode());
+                st.setObject(index, javaType.unwrap(value, String.class, options), getJdbcTypeCode());
             }
 
             @Override
             protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
                     throws SQLException {
-                st.setObject(name, javaType.unwrap(value, JsonNode.class, options), getJdbcTypeCode());
+                st.setObject(name, javaType.unwrap(value, String.class, options), getJdbcTypeCode());
             }
         };
     }

diff --git a/.../src/test/java/com/vladmihalcea/hibernate/type/json/PostgreSQLJsonStringPropertyTest.java b/.../src/test/java/com/vladmihalcea/hibernate/type/json/PostgreSQLJsonStringPropertyTest.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.json;
 
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.vladmihalcea.hibernate.util.AbstractPostgreSQLIntegrationTest;
 import com.vladmihalcea.hibernate.util.ExceptionUtil;
@@ -164,8 +163,8 @@ public void testInvalidJson() {
             });
             fail("An invalid JSON should throw an exception!");
         } catch (Exception e) {
-            JsonParseException rootCause = ExceptionUtil.rootCause(e);
-            assertTrue(rootCause.getMessage().contains("Unexpected character (':'"));
+            Exception rootCause = ExceptionUtil.rootCause(e);
+            assertTrue(rootCause.getMessage().contains("invalid input syntax for type json"));
         }
     }