HHH-7889 Cleanup inconsistencies in Blob, Clob, and NClob type

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobTypeDescriptor.java

@@ -23,14 +23,17 @@
  */
 package org.hibernate.type.descriptor.java;
 
+import java.io.Reader;
 import java.io.Serializable;
 import java.sql.Clob;
+import java.sql.SQLException;
 import java.util.Comparator;
 
+import org.hibernate.HibernateException;
+import org.hibernate.engine.jdbc.CharacterStream;
 import org.hibernate.engine.jdbc.ClobImplementer;
 import org.hibernate.engine.jdbc.ClobProxy;
 import org.hibernate.engine.jdbc.WrappedClob;
-import org.hibernate.engine.jdbc.CharacterStream;
 import org.hibernate.engine.jdbc.internal.CharacterStreamImpl;
 import org.hibernate.type.descriptor.WrapperOptions;
 
@@ -95,40 +98,50 @@ public class ClobTypeDescriptor extends AbstractTypeDescriptor<Clob> {
 
 	@SuppressWarnings({ "unchecked" })
 	public <X> X unwrap(final Clob value, Class<X> type, WrapperOptions options) {
-		if ( ! ( Clob.class.isAssignableFrom( type ) || CharacterStream.class.isAssignableFrom( type ) ) ) {
-			throw unknownUnwrap( type );
-		}
-
 		if ( value == null ) {
 			return null;
 		}
 
+		try {
 			if ( CharacterStream.class.isAssignableFrom( type ) ) {
 				if ( ClobImplementer.class.isInstance( value ) ) {
-				// if the incoming Clob is a wrapper, just pass along its CharacterStream
+					// if the incoming Clob is a wrapper, just pass along its BinaryStream
 					return (X) ( (ClobImplementer) value ).getUnderlyingStream();
 				}
 				else {
-				// otherwise we need to build one...
+					// otherwise we need to build a BinaryStream...
-				return (X) new CharacterStreamImpl( DataHelper.extractString( value ) );
+					return (X) new CharacterStreamImpl( DataHelper.extractString( value.getCharacterStream() ) );
 				}
 			}
-
+			else if (Clob.class.isAssignableFrom( type )) {
 				final Clob clob =  WrappedClob.class.isInstance( value )
 						? ( (WrappedClob) value ).getWrappedClob()
 						: value;
 				return (X) clob;
 			}
+		}
+		catch ( SQLException e ) {
+			throw new HibernateException( "Unable to access clob stream", e );
+		}
+		
+		throw unknownUnwrap( type );
+	}
 
 	public <X> Clob wrap(X value, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
-		if ( ! Clob.class.isAssignableFrom( value.getClass() ) ) {
+		// Support multiple return types from
-			throw unknownWrap( value.getClass() );
+		// org.hibernate.type.descriptor.sql.ClobTypeDescriptor
-		}
+		if ( Clob.class.isAssignableFrom( value.getClass() ) ) {
-
 			return options.getLobCreator().wrap( (Clob) value );
 		}
+		else if ( Reader.class.isAssignableFrom( value.getClass() ) ) {
+			Reader reader = (Reader) value;
+			return options.getLobCreator().createClob( DataHelper.extractString( reader ) );
+		}
+
+		throw unknownWrap( value.getClass() );
+	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobTypeDescriptor.java

@@ -23,10 +23,13 @@
  */
 package org.hibernate.type.descriptor.java;
 
+import java.io.Reader;
 import java.io.Serializable;
 import java.sql.NClob;
+import java.sql.SQLException;
 import java.util.Comparator;
 
+import org.hibernate.HibernateException;
 import org.hibernate.engine.jdbc.CharacterStream;
 import org.hibernate.engine.jdbc.NClobImplementer;
 import org.hibernate.engine.jdbc.NClobProxy;
@@ -95,29 +98,33 @@ public class NClobTypeDescriptor extends AbstractTypeDescriptor<NClob> {
 
 	@SuppressWarnings({ "unchecked" })
 	public <X> X unwrap(final NClob value, Class<X> type, WrapperOptions options) {
-		if ( ! ( NClob.class.isAssignableFrom( type ) || CharacterStream.class.isAssignableFrom( type ) ) ) {
-			throw unknownUnwrap( type );
-		}
-
 		if ( value == null ) {
 			return null;
 		}
 
+		try {
 			if ( CharacterStream.class.isAssignableFrom( type ) ) {
 				if ( NClobImplementer.class.isInstance( value ) ) {
-				// if the incoming Clob is a wrapper, just pass along its CharacterStream
+					// if the incoming NClob is a wrapper, just pass along its BinaryStream
 					return (X) ( (NClobImplementer) value ).getUnderlyingStream();
 				}
 				else {
-				// otherwise we need to build one...
+					// otherwise we need to build a BinaryStream...
-				return (X) new CharacterStreamImpl( DataHelper.extractString( value ) );
+					return (X) new CharacterStreamImpl( DataHelper.extractString( value.getCharacterStream() ) );
 				}
 			}
-
+			else if (NClob.class.isAssignableFrom( type )) {
-		final NClob clob =  WrappedNClob.class.isInstance( value )
+				final NClob nclob =  WrappedNClob.class.isInstance( value )
 						? ( (WrappedNClob) value ).getWrappedNClob()
 						: value;
-		return (X) clob;
+				return (X) nclob;
+			}
+		}
+		catch ( SQLException e ) {
+			throw new HibernateException( "Unable to access nclob stream", e );
+		}
+		
+		throw unknownUnwrap( type );
 	}
 
 	public <X> NClob wrap(X value, WrapperOptions options) {
@@ -125,10 +132,16 @@ public class NClobTypeDescriptor extends AbstractTypeDescriptor<NClob> {
 			return null;
 		}
 
-		if ( ! NClob.class.isAssignableFrom( value.getClass() ) ) {
+		// Support multiple return types from
-			throw unknownWrap( value.getClass() );
+		// org.hibernate.type.descriptor.sql.ClobTypeDescriptor
-		}
+		if ( NClob.class.isAssignableFrom( value.getClass() ) ) {
-
 			return options.getLobCreator().wrap( (NClob) value );
 		}
+		else if ( Reader.class.isAssignableFrom( value.getClass() ) ) {
+			Reader reader = (Reader) value;
+			return options.getLobCreator().createNClob( DataHelper.extractString( reader ) );
+		}
+
+		throw unknownWrap( value.getClass() );
+	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/BlobTypeDescriptor.java

@@ -91,18 +91,18 @@ public abstract class BlobTypeDescriptor implements SqlTypeDescriptor {
 				@Override
                 public <X> BasicExtractor<X> getBlobExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
 					return new BasicExtractor<X>( javaTypeDescriptor, this ) {
-						// For now, default to using getBlob.  If extraction
-						// should also check useStreamForLobBinding, add
-						// checks here and use STREAM_BINDING.
-						
 						@Override
 						protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
-							return BLOB_BINDING.getExtractor( javaTypeDescriptor ).doExtract( rs, name, options );
+							return getBinding( options ).getExtractor( javaTypeDescriptor ).doExtract( rs, name, options );
 						}
 					};
 				}
 			};
 			
+	private static final BlobTypeDescriptor getBinding( WrapperOptions options ) {
+		return options.useStreamForLobBinding() ? STREAM_BINDING : BLOB_BINDING;
+	}
+
 	public static final BlobTypeDescriptor PRIMITIVE_ARRAY_BINDING =
 			new BlobTypeDescriptor() {
 				@Override
@@ -175,4 +175,5 @@ public abstract class BlobTypeDescriptor implements SqlTypeDescriptor {
 					};
 				}
 			};
+
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/ClobTypeDescriptor.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.type.descriptor.sql;
 
+import java.sql.CallableStatement;
 import java.sql.Clob;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -39,28 +40,64 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
  * Descriptor for {@link Types#CLOB CLOB} handling.
  *
  * @author Steve Ebersole
+ * @author Gail Badner
  */
 public abstract class ClobTypeDescriptor implements SqlTypeDescriptor {
+	@Override
+	public int getSqlType() {
+		return Types.CLOB;
+	}
+
+	@Override
+	public boolean canBeRemapped() {
+		return true;
+	}
+	
+    protected abstract <X> BasicExtractor<X> getClobExtractor(JavaTypeDescriptor<X> javaTypeDescriptor);
+	
+    @Override
+    public <X> ValueExtractor<X> getExtractor(JavaTypeDescriptor<X> javaTypeDescriptor) {
+        return getClobExtractor( javaTypeDescriptor );
+    }
+
+	protected abstract <X> BasicBinder<X> getClobBinder(JavaTypeDescriptor<X> javaTypeDescriptor);
+
+	@Override
+    public <X> ValueBinder<X> getBinder(JavaTypeDescriptor<X> javaTypeDescriptor) {
+		return getClobBinder( javaTypeDescriptor );
+	}
+
 
 	public static final ClobTypeDescriptor DEFAULT =
 			new ClobTypeDescriptor() {
+				@Override
                 public <X> BasicBinder<X> getClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
 					return new BasicBinder<X>( javaTypeDescriptor, this ) {
 						@Override
 						protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-							if ( options.useStreamForLobBinding() ) {
+							getBinding( options ).getClobBinder( javaTypeDescriptor ).doBind( st, value, index, options );
-								STREAM_BINDING.getClobBinder( javaTypeDescriptor ).doBind( st, value, index, options );
 						}
-							else {
+					};
-								CLOB_BINDING.getClobBinder( javaTypeDescriptor ).doBind( st, value, index, options );
 				}
+				
+				@Override
+				public <X> BasicExtractor<X> getClobExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
+				    return new BasicExtractor<X>( javaTypeDescriptor, this ) {
+				        @Override
+				        protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+				        	return getBinding( options ).getClobExtractor( javaTypeDescriptor ).doExtract( rs, name, options );
 				        }
                     };
 				}
 			};
 			
+	private static final ClobTypeDescriptor getBinding( WrapperOptions options ) {
+		return options.useStreamForLobBinding() ? STREAM_BINDING : CLOB_BINDING;
+	}
+
 	public static final ClobTypeDescriptor CLOB_BINDING =
 			new ClobTypeDescriptor() {
+				@Override
                 public <X> BasicBinder<X> getClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
 					return new BasicBinder<X>( javaTypeDescriptor, this ) {
 						@Override
@@ -70,10 +107,23 @@ public abstract class ClobTypeDescriptor implements SqlTypeDescriptor {
 						}
 					};
 				}
+				
+				@Override
+                public <X> BasicExtractor<X> getClobExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
+				    return new BasicExtractor<X>(javaTypeDescriptor, this) {
+
+                        @Override
+                        protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+                            return javaTypeDescriptor.wrap( rs.getClob( name ), options );
+                        }
+				        
+                    };
+				};
 			};
 
 	public static final ClobTypeDescriptor STREAM_BINDING =
 			new ClobTypeDescriptor() {
+				@Override
                 public <X> BasicBinder<X> getClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
 					return new BasicBinder<X>( javaTypeDescriptor, this ) {
 						@Override
@@ -84,29 +134,18 @@ public abstract class ClobTypeDescriptor implements SqlTypeDescriptor {
 						}
 					};
 				}
-			};
-
-	protected abstract <X> BasicBinder<X> getClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor);
-
-	public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
-		return getClobBinder( javaTypeDescriptor );
-	}
-
-	public int getSqlType() {
-		return Types.CLOB;
-	}
                 
                 @Override
-	public boolean canBeRemapped() {
+                public <X> BasicExtractor<X> getClobExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
-		return true;
-	}
-
-	public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
                     return new BasicExtractor<X>(javaTypeDescriptor, this) {
+
                         @Override
                         protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
-				return javaTypeDescriptor.wrap( rs.getClob( name ), options );
+                            return javaTypeDescriptor.wrap( rs.getCharacterStream( name ), options );
                         }
+                        
                     };
-	}
+                };
+			};
+
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/NClobTypeDescriptor.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.type.descriptor.sql;
 
+import java.sql.CallableStatement;
 import java.sql.NClob;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -42,26 +43,61 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
  * @author Gail Badner
  */
 public abstract class NClobTypeDescriptor implements SqlTypeDescriptor {
+	@Override
+	public int getSqlType() {
+		return Types.NCLOB;
+	}
+
+	@Override
+	public boolean canBeRemapped() {
+		return true;
+	}
+	
+    protected abstract <X> BasicExtractor<X> getNClobExtractor(JavaTypeDescriptor<X> javaTypeDescriptor);
+	
+    @Override
+    public <X> ValueExtractor<X> getExtractor(JavaTypeDescriptor<X> javaTypeDescriptor) {
+        return getNClobExtractor( javaTypeDescriptor );
+    }
+
+	protected abstract <X> BasicBinder<X> getNClobBinder(JavaTypeDescriptor<X> javaTypeDescriptor);
+
+	@Override
+    public <X> ValueBinder<X> getBinder(JavaTypeDescriptor<X> javaTypeDescriptor) {
+		return getNClobBinder( javaTypeDescriptor );
+	}
+
 
 	public static final NClobTypeDescriptor DEFAULT =
 			new NClobTypeDescriptor() {
+				@Override
                 public <X> BasicBinder<X> getNClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
 					return new BasicBinder<X>( javaTypeDescriptor, this ) {
 						@Override
 						protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-							if ( options.useStreamForLobBinding() ) {
+							getBinding( options ).getNClobBinder( javaTypeDescriptor ).doBind( st, value, index, options );
-								STREAM_BINDING.getNClobBinder( javaTypeDescriptor ).doBind( st, value, index, options );
 						}
-							else {
+					};
-								CLOB_BINDING.getNClobBinder( javaTypeDescriptor ).doBind( st, value, index, options );
 				}
+				
+				@Override
+				public <X> BasicExtractor<X> getNClobExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
+				    return new BasicExtractor<X>( javaTypeDescriptor, this ) {
+				        @Override
+				        protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+				        	return getBinding( options ).getNClobExtractor( javaTypeDescriptor ).doExtract( rs, name, options );
 				        }
                     };
 				}
 			};
 			
-	public static final NClobTypeDescriptor CLOB_BINDING =
+	private static final NClobTypeDescriptor getBinding( WrapperOptions options ) {
+		return options.useStreamForLobBinding() ? STREAM_BINDING : NCLOB_BINDING;
+	}
+
+	public static final NClobTypeDescriptor NCLOB_BINDING =
 			new NClobTypeDescriptor() {
+				@Override
                 public <X> BasicBinder<X> getNClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
 					return new BasicBinder<X>( javaTypeDescriptor, this ) {
 						@Override
@@ -71,10 +107,23 @@ public abstract class NClobTypeDescriptor implements SqlTypeDescriptor {
 						}
 					};
 				}
+				
+				@Override
+                public <X> BasicExtractor<X> getNClobExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
+				    return new BasicExtractor<X>(javaTypeDescriptor, this) {
+
+                        @Override
+                        protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
+                            return javaTypeDescriptor.wrap( rs.getNClob( name ), options );
+                        }
+				        
+                    };
+				};
 			};
 
 	public static final NClobTypeDescriptor STREAM_BINDING =
 			new NClobTypeDescriptor() {
+				@Override
                 public <X> BasicBinder<X> getNClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
 					return new BasicBinder<X>( javaTypeDescriptor, this ) {
 						@Override
@@ -85,29 +134,17 @@ public abstract class NClobTypeDescriptor implements SqlTypeDescriptor {
 						}
 					};
 				}
-			};
-
-	protected abstract <X> BasicBinder<X> getNClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor);
-
-	public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
-		return getNClobBinder( javaTypeDescriptor );
-	}
-
-	public int getSqlType() {
-		return Types.CLOB;
-	}
                 
                 @Override
-	public boolean canBeRemapped() {
+                public <X> BasicExtractor<X> getNClobExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
-		return true;
-	}
-
-	public <X> ValueExtractor<X> getExtractor(final JavaTypeDescriptor<X> javaTypeDescriptor) {
                     return new BasicExtractor<X>(javaTypeDescriptor, this) {
+
                         @Override
                         protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
-				return javaTypeDescriptor.wrap( rs.getNClob( name ), options );
+                            return javaTypeDescriptor.wrap( rs.getCharacterStream( name ), options );
                         }
+                        
+                    };
+                };
 			};
 }
-}