HHH-15165 Add abstract GIS base types to reduce code duplication

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/AbstractPostGISJdbcType.java

@@ -0,0 +1,168 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+
+package org.hibernate.spatial.dialect.postgis;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.spatial.GeometryLiteralFormatter;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+
+import org.geolatte.geom.ByteBuffer;
+import org.geolatte.geom.ByteOrder;
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.Wkb;
+import org.geolatte.geom.codec.WkbDecoder;
+import org.geolatte.geom.codec.WkbEncoder;
+import org.geolatte.geom.codec.Wkt;
+import org.geolatte.geom.codec.WktDecoder;
+import org.postgresql.util.PGobject;
+
+/**
+ * Type Descriptor for the Postgis Geometry type
+ *
+ * @author Karel Maesen, Geovise BVBA
+ */
+public abstract class AbstractPostGISJdbcType implements JdbcType {
+
+	private final Wkb.Dialect wkbDialect;
+
+	AbstractPostGISJdbcType(Wkb.Dialect dialect) {
+		wkbDialect = dialect;
+	}
+
+	@Override
+	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
+		return new PGGeometryLiteralFormatter<>( getConstructorFunction(), javaType );
+	}
+
+	public abstract int getDefaultSqlTypeCode();
+
+	protected abstract String getConstructorFunction();
+
+	protected abstract String getPGTypeName();
+
+	public Geometry<?> toGeometry(Object object) {
+		if ( object == null ) {
+			return null;
+		}
+		ByteBuffer buffer;
+		if ( object instanceof PGobject ) {
+			String pgValue = ( (PGobject) object ).getValue();
+			if (pgValue == null) {
+				return null;
+			}
+			if ( pgValue.startsWith( "00" ) || pgValue.startsWith( "01" ) ) {
+				//we have a WKB because this pgValue starts with the bit-order byte
+				buffer = ByteBuffer.from( pgValue );
+				final WkbDecoder decoder = Wkb.newDecoder( wkbDialect );
+				return decoder.decode( buffer );
+			}
+			else {
+				return parseWkt( pgValue );
+			}
+
+		}
+		throw new IllegalStateException( "Received object of type " + object.getClass().getCanonicalName() );
+	}
+
+	private static Geometry<?> parseWkt(String pgValue) {
+		final WktDecoder decoder = Wkt.newDecoder( Wkt.Dialect.POSTGIS_EWKT_1 );
+		return decoder.decode( pgValue );
+	}
+
+
+	@Override
+	public int getJdbcTypeCode() {
+		return Types.OTHER;
+	}
+
+	@Override
+	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 {
+				final PGobject obj = toPGobject( value, options );
+				st.setObject( index, obj );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final PGobject obj = toPGobject( value, options );
+				st.setObject( name, obj );
+			}
+
+			private PGobject toPGobject(X value, WrapperOptions options) throws SQLException {
+				final WkbEncoder encoder = Wkb.newEncoder( wkbDialect );
+				final Geometry<?> geometry = getJavaType().unwrap( value, Geometry.class, options );
+				final String hexString = encoder.encode( geometry, ByteOrder.NDR ).toString();
+				final PGobject obj = new PGobject();
+				obj.setType( getPGTypeName() );
+				obj.setValue( hexString );
+				return obj;
+			}
+
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
+		return new BasicExtractor<X>( javaType, this ) {
+
+
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				return getJavaType().wrap( toGeometry( rs.getObject( paramIndex ) ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
+				return getJavaType().wrap( toGeometry( statement.getObject( index ) ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
+				return getJavaType().wrap( toGeometry( statement.getObject( name ) ), options );
+			}
+		};
+	}
+
+	static class PGGeometryLiteralFormatter<T> extends GeometryLiteralFormatter<T> {
+
+		private final String constructorFunction;
+
+		public PGGeometryLiteralFormatter(String constructorFunction, JavaType<T> javaType) {
+			super( javaType, Wkt.Dialect.POSTGIS_EWKT_1, "" );
+			this.constructorFunction = constructorFunction;
+		}
+
+		@Override
+		public void appendJdbcLiteral(SqlAppender appender, T value, Dialect dialect, WrapperOptions wrapperOptions) {
+			Geometry<?> geom = javaType.unwrap( value, Geometry.class, wrapperOptions );
+			appender.append( constructorFunction );
+			appender.appendSql( "('" );
+			appender.appendSql( Wkt.toWkt( geom, wktDialect ) );
+			appender.appendSql( "')" );
+		}
+	}
+}

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeographyJdbcType.java

@@ -7,90 +7,22 @@
 
 package org.hibernate.spatial.dialect.postgis;
 
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import org.hibernate.dialect.Dialect;
-import org.hibernate.spatial.GeometryLiteralFormatter;
-import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.ValueBinder;
-import org.hibernate.type.descriptor.ValueExtractor;
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.BasicBinder;
-import org.hibernate.type.descriptor.jdbc.BasicExtractor;
-import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
-import org.hibernate.type.descriptor.jdbc.JdbcType;
 
-import org.geolatte.geom.ByteBuffer;
-import org.geolatte.geom.ByteOrder;
-import org.geolatte.geom.Geometry;
 import org.geolatte.geom.codec.Wkb;
-import org.geolatte.geom.codec.WkbDecoder;
-import org.geolatte.geom.codec.WkbEncoder;
-import org.geolatte.geom.codec.Wkt;
-import org.geolatte.geom.codec.WktDecoder;
-import org.postgresql.util.PGobject;
 
 /**
  * Type Descriptor for the Postgis Geography type
  *
  * @author Karel Maesen, Geovise BVBA
  */
-public class PGGeographyJdbcType implements JdbcType {
-
-
-	private final Wkb.Dialect wkbDialect;
+public class PGGeographyJdbcType extends AbstractPostGISJdbcType {
 
 	// Type descriptor instance using EWKB v2 (postgis versions >= 2.2.2, see: https://trac.osgeo.org/postgis/ticket/3181)
 	public static final PGGeographyJdbcType INSTANCE_WKB_2 = new PGGeographyJdbcType( Wkb.Dialect.POSTGIS_EWKB_2 );
 
-	@Override
-	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
-		return new PGGeometryLiteralFormatter<>( javaType );
-	}
-
 	private PGGeographyJdbcType(Wkb.Dialect dialect) {
-		wkbDialect = dialect;
-	}
-
-	public Geometry<?> toGeometry(Object object) {
-		if ( object == null ) {
-			return null;
-		}
-		ByteBuffer buffer;
-		if ( object instanceof PGobject ) {
-			String pgValue = ( (PGobject) object ).getValue();
-			if (pgValue == null) {
-				return null;
-			}
-			if ( pgValue.startsWith( "00" ) || pgValue.startsWith( "01" ) ) {
-				//we have a WKB because this pgValue starts with the bit-order byte
-				buffer = ByteBuffer.from( pgValue );
-				final WkbDecoder decoder = Wkb.newDecoder( wkbDialect );
-				return decoder.decode( buffer );
-			}
-			else {
-				return parseWkt( pgValue );
-			}
-
-		}
-		throw new IllegalStateException( "Received object of type " + object.getClass().getCanonicalName() );
-	}
-
-	private static Geometry<?> parseWkt(String pgValue) {
-		final WktDecoder decoder = Wkt.newDecoder( Wkt.Dialect.POSTGIS_EWKT_1 );
-		return decoder.decode( pgValue );
-	}
-
-
-	@Override
-	public int getJdbcTypeCode() {
-		return Types.OTHER;
+		super( dialect );
 	}
 
 	@Override
@@ -99,70 +31,12 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	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 {
-				final PGobject obj = toPGobject( value, options );
-				st.setObject( index, obj );
-			}
-
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final PGobject obj = toPGobject( value, options );
-				st.setObject( name, obj );
-			}
-
-			private PGobject toPGobject(X value, WrapperOptions options) throws SQLException {
-				final WkbEncoder encoder = Wkb.newEncoder( wkbDialect );
-				final Geometry<?> geometry = getJavaType().unwrap( value, Geometry.class, options );
-				final String hexString = encoder.encode( geometry, ByteOrder.NDR ).toString();
-				final PGobject obj = new PGobject();
-				obj.setType( "geography" );
-				obj.setValue( hexString );
-				return obj;
-			}
-
-		};
+	protected String getConstructorFunction() {
+		return "st_geogfromtext";
 	}
 
 	@Override
-	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
-		return new BasicExtractor<X>( javaType, this ) {
-
-
-			@Override
-			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( rs.getObject( paramIndex ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( index ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
-					throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( name ) ), options );
-			}
-		};
-	}
-
-	static class PGGeometryLiteralFormatter<T> extends GeometryLiteralFormatter<T> {
-		public PGGeometryLiteralFormatter(JavaType<T> javaType) {
-			super( javaType, Wkt.Dialect.POSTGIS_EWKT_1, "" );
-		}
-
-		@Override
-		public void appendJdbcLiteral(
-				SqlAppender appender, T value, Dialect dialect, WrapperOptions wrapperOptions) {
-			Geometry<?> geom = javaType.unwrap( value, Geometry.class, wrapperOptions );
-			appender.appendSql( "st_geogfromtext('" );
-			appender.appendSql( Wkt.toWkt( geom, wktDialect ) );
-			appender.appendSql( "')" );
-		}
+	protected String getPGTypeName() {
+		return "geography";
 	}
 }

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGGeometryJdbcType.java

@@ -7,90 +7,22 @@
 
 package org.hibernate.spatial.dialect.postgis;
 
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import org.hibernate.dialect.Dialect;
-import org.hibernate.spatial.GeometryLiteralFormatter;
-import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.ValueBinder;
-import org.hibernate.type.descriptor.ValueExtractor;
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.BasicBinder;
-import org.hibernate.type.descriptor.jdbc.BasicExtractor;
-import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
-import org.hibernate.type.descriptor.jdbc.JdbcType;
 
-import org.geolatte.geom.ByteBuffer;
-import org.geolatte.geom.ByteOrder;
-import org.geolatte.geom.Geometry;
 import org.geolatte.geom.codec.Wkb;
-import org.geolatte.geom.codec.WkbDecoder;
-import org.geolatte.geom.codec.WkbEncoder;
-import org.geolatte.geom.codec.Wkt;
-import org.geolatte.geom.codec.WktDecoder;
-import org.postgresql.util.PGobject;
 
 /**
  * Type Descriptor for the Postgis Geometry type
  *
  * @author Karel Maesen, Geovise BVBA
  */
-public class PGGeometryJdbcType implements JdbcType {
-
-
-	private final Wkb.Dialect wkbDialect;
+public class PGGeometryJdbcType extends AbstractPostGISJdbcType {
 
 	// Type descriptor instance using EWKB v2 (postgis versions >= 2.2.2, see: https://trac.osgeo.org/postgis/ticket/3181)
 	public static final PGGeometryJdbcType INSTANCE_WKB_2 = new PGGeometryJdbcType( Wkb.Dialect.POSTGIS_EWKB_2 );
 
-	@Override
-	public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
-		return new PGGeometryLiteralFormatter<>( javaType );
-	}
-
 	private PGGeometryJdbcType(Wkb.Dialect dialect) {
-		wkbDialect = dialect;
-	}
-
-	public Geometry<?> toGeometry(Object object) {
-		if ( object == null ) {
-			return null;
-		}
-		ByteBuffer buffer;
-		if ( object instanceof PGobject ) {
-			String pgValue = ( (PGobject) object ).getValue();
-			if (pgValue == null) {
-				return null;
-			}
-			if ( pgValue.startsWith( "00" ) || pgValue.startsWith( "01" ) ) {
-				//we have a WKB because this pgValue starts with the bit-order byte
-				buffer = ByteBuffer.from( pgValue );
-				final WkbDecoder decoder = Wkb.newDecoder( wkbDialect );
-				return decoder.decode( buffer );
-			}
-			else {
-				return parseWkt( pgValue );
-			}
-
-		}
-		throw new IllegalStateException( "Received object of type " + object.getClass().getCanonicalName() );
-	}
-
-	private static Geometry<?> parseWkt(String pgValue) {
-		final WktDecoder decoder = Wkt.newDecoder( Wkt.Dialect.POSTGIS_EWKT_1 );
-		return decoder.decode( pgValue );
-	}
-
-
-	@Override
-	public int getJdbcTypeCode() {
-		return Types.OTHER;
+		super( dialect );
 	}
 
 	@Override
@@ -99,70 +31,13 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	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 {
-				final PGobject obj = toPGobject( value, options );
-				st.setObject( index, obj );
-			}
-
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final PGobject obj = toPGobject( value, options );
-				st.setObject( name, obj );
-			}
-
-			private PGobject toPGobject(X value, WrapperOptions options) throws SQLException {
-				final WkbEncoder encoder = Wkb.newEncoder( wkbDialect );
-				final Geometry<?> geometry = getJavaType().unwrap( value, Geometry.class, options );
-				final String hexString = encoder.encode( geometry, ByteOrder.NDR ).toString();
-				final PGobject obj = new PGobject();
-				obj.setType( "geometry" );
-				obj.setValue( hexString );
-				return obj;
-			}
-
-		};
+	protected String getConstructorFunction() {
+		return "st_geomfromewkt";
 	}
 
 	@Override
-	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
-		return new BasicExtractor<X>( javaType, this ) {
-
-
-			@Override
-			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( rs.getObject( paramIndex ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( index ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
-					throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( name ) ), options );
-			}
-		};
+	protected String getPGTypeName() {
+		return "geometry";
 	}
 
-	static class PGGeometryLiteralFormatter<T> extends GeometryLiteralFormatter<T> {
-		public PGGeometryLiteralFormatter(JavaType<T> javaType) {
-			super( javaType, Wkt.Dialect.POSTGIS_EWKT_1, "" );
-		}
-
-		@Override
-		public void appendJdbcLiteral(
-				SqlAppender appender, T value, Dialect dialect, WrapperOptions wrapperOptions) {
-			Geometry<?> geom = javaType.unwrap( value, Geometry.class, wrapperOptions );
-			appender.appendSql( "st_geomfromewkt('" );
-			appender.appendSql( Wkt.toWkt( geom, wktDialect ) );
-			appender.appendSql( "')" );
-		}
-	}
 }

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/AbstractSqlServerGISType.java

@@ -0,0 +1,122 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+
+package org.hibernate.spatial.dialect.sqlserver;
+
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.hibernate.spatial.GeometryLiteralFormatter;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.Wkt;
+import org.geolatte.geom.codec.db.sqlserver.Decoders;
+import org.geolatte.geom.codec.db.sqlserver.Encoders;
+
+/**
+ * Type descriptor for the SQL Server 2008 Geometry type.
+ *
+ * @author Karel Maesen, Geovise BVBA
+ * creation-date: 8/23/11
+ */
+public abstract class AbstractSqlServerGISType implements JdbcType {
+
+	@Override
+	public int getJdbcTypeCode() {
+		return Types.ARRAY;
+	}
+
+	@Override
+	public abstract int getDefaultSqlTypeCode();
+
+	@Override
+	public abstract <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType);
+
+	@Override
+	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 {
+				final Geometry geometry = getJavaType().unwrap( value, Geometry.class, options );
+				final byte[] bytes = Encoders.encode( geometry );
+				st.setObject( index, bytes );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final Geometry geometry = getJavaType().unwrap( value, Geometry.class, options );
+				final byte[] bytes = Encoders.encode( geometry );
+				st.setObject( name, bytes );
+			}
+
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
+		return new BasicExtractor<X>( javaType, this ) {
+
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				return getJavaType().wrap( toGeometry( rs.getObject( paramIndex ) ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
+				return getJavaType().wrap( toGeometry( statement.getObject( index ) ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
+				return getJavaType().wrap( toGeometry( statement.getObject( name ) ), options );
+			}
+		};
+	}
+
+	private Geometry toGeometry(Object obj) {
+		byte[] raw = null;
+		if ( obj == null ) {
+			return null;
+		}
+		if ( ( obj instanceof byte[] ) ) {
+			raw = (byte[]) obj;
+		}
+		else if ( obj instanceof Blob ) {
+			raw = toByteArray( (Blob) obj );
+		}
+		else {
+			throw new IllegalArgumentException( "Expected byte array or BLOB" );
+		}
+		return Decoders.decode( raw );
+	}
+
+	private byte[] toByteArray(Blob blob) {
+		try {
+			return blob.getBytes( 1, (int) blob.length() );
+		}
+		catch (SQLException e) {
+			throw new RuntimeException( "Error on transforming blob into array.", e );
+		}
+	}
+
+}

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeographyType.java

@@ -7,28 +7,12 @@
 
 package org.hibernate.spatial.dialect.sqlserver;
 
-import java.sql.Blob;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
 import org.hibernate.spatial.GeometryLiteralFormatter;
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.ValueBinder;
-import org.hibernate.type.descriptor.ValueExtractor;
-import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.BasicBinder;
-import org.hibernate.type.descriptor.jdbc.BasicExtractor;
 import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
-import org.hibernate.type.descriptor.jdbc.JdbcType;
 
-import org.geolatte.geom.Geometry;
 import org.geolatte.geom.codec.Wkt;
-import org.geolatte.geom.codec.db.sqlserver.Decoders;
-import org.geolatte.geom.codec.db.sqlserver.Encoders;
 
 /**
  * Type descriptor for the SQL Server 2008 Geography type.
@@ -36,18 +20,13 @@
  * @author Karel Maesen, Geovise BVBA
  * creation-date: 8/23/11
  */
-public class SqlServerGeographyType implements JdbcType {
+public class SqlServerGeographyType extends AbstractSqlServerGISType {
 
 	/**
 	 * An instance of the descrtiptor
 	 */
 	public static final SqlServerGeographyType INSTANCE = new SqlServerGeographyType();
 
-	@Override
-	public int getJdbcTypeCode() {
-		return Types.ARRAY;
-	}
-
 	@Override
 	public int getDefaultSqlTypeCode() {
 		return SqlTypes.GEOGRAPHY;
@@ -58,74 +37,4 @@ public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType)
 		return new GeometryLiteralFormatter<>( javaType, Wkt.Dialect.SFA_1_2_1, "geography::STGeomFromText" );
 	}
 
-	@Override
-	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 {
-				final Geometry geometry = getJavaType().unwrap( value, Geometry.class, options );
-				final byte[] bytes = Encoders.encode( geometry );
-				st.setObject( index, bytes );
-			}
-
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final Geometry geometry = getJavaType().unwrap( value, Geometry.class, options );
-				final byte[] bytes = Encoders.encode( geometry );
-				st.setObject( name, bytes );
-			}
-
-		};
-	}
-
-	@Override
-	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
-		return new BasicExtractor<X>( javaType, this ) {
-
-			@Override
-			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( rs.getObject( paramIndex ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( index ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
-					throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( name ) ), options );
-			}
-		};
-	}
-
-	private Geometry toGeometry(Object obj) {
-		byte[] raw = null;
-		if ( obj == null ) {
-			return null;
-		}
-		if ( ( obj instanceof byte[] ) ) {
-			raw = (byte[]) obj;
-		}
-		else if ( obj instanceof Blob ) {
-			raw = toByteArray( (Blob) obj );
-		}
-		else {
-			throw new IllegalArgumentException( "Expected byte array or BLOB" );
-		}
-		return Decoders.decode( raw );
-	}
-
-	private byte[] toByteArray(Blob blob) {
-		try {
-			return blob.getBytes( 1, (int) blob.length() );
-		}
-		catch (SQLException e) {
-			throw new RuntimeException( "Error on transforming blob into array.", e );
-		}
-	}
-
 }

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerGeometryType.java

@@ -7,28 +7,12 @@
 
 package org.hibernate.spatial.dialect.sqlserver;
 
-import java.sql.Blob;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
 import org.hibernate.spatial.GeometryLiteralFormatter;
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.ValueBinder;
-import org.hibernate.type.descriptor.ValueExtractor;
-import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.BasicBinder;
-import org.hibernate.type.descriptor.jdbc.BasicExtractor;
 import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
-import org.hibernate.type.descriptor.jdbc.JdbcType;
 
-import org.geolatte.geom.Geometry;
 import org.geolatte.geom.codec.Wkt;
-import org.geolatte.geom.codec.db.sqlserver.Decoders;
-import org.geolatte.geom.codec.db.sqlserver.Encoders;
 
 /**
  * Type descriptor for the SQL Server 2008 Geometry type.
@@ -36,18 +20,13 @@
  * @author Karel Maesen, Geovise BVBA
  * creation-date: 8/23/11
  */
-public class SqlServerGeometryType implements JdbcType {
+public class SqlServerGeometryType extends AbstractSqlServerGISType {
 
 	/**
 	 * An instance of the descrtiptor
 	 */
 	public static final SqlServerGeometryType INSTANCE = new SqlServerGeometryType();
 
-	@Override
-	public int getJdbcTypeCode() {
-		return Types.ARRAY;
-	}
-
 	@Override
 	public int getDefaultSqlTypeCode() {
 		return SqlTypes.GEOMETRY;
@@ -58,74 +37,4 @@ public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType)
 		return new GeometryLiteralFormatter<>( javaType, Wkt.Dialect.SFA_1_2_1, "geometry::STGeomFromText" );
 	}
 
-	@Override
-	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 {
-				final Geometry geometry = getJavaType().unwrap( value, Geometry.class, options );
-				final byte[] bytes = Encoders.encode( geometry );
-				st.setObject( index, bytes );
-			}
-
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final Geometry geometry = getJavaType().unwrap( value, Geometry.class, options );
-				final byte[] bytes = Encoders.encode( geometry );
-				st.setObject( name, bytes );
-			}
-
-		};
-	}
-
-	@Override
-	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
-		return new BasicExtractor<X>( javaType, this ) {
-
-			@Override
-			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( rs.getObject( paramIndex ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( index ) ), options );
-			}
-
-			@Override
-			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
-					throws SQLException {
-				return getJavaType().wrap( toGeometry( statement.getObject( name ) ), options );
-			}
-		};
-	}
-
-	private Geometry toGeometry(Object obj) {
-		byte[] raw = null;
-		if ( obj == null ) {
-			return null;
-		}
-		if ( ( obj instanceof byte[] ) ) {
-			raw = (byte[]) obj;
-		}
-		else if ( obj instanceof Blob ) {
-			raw = toByteArray( (Blob) obj );
-		}
-		else {
-			throw new IllegalArgumentException( "Expected byte array or BLOB" );
-		}
-		return Decoders.decode( raw );
-	}
-
-	private byte[] toByteArray(Blob blob) {
-		try {
-			return blob.getBytes( 1, (int) blob.length() );
-		}
-		catch (SQLException e) {
-			throw new RuntimeException( "Error on transforming blob into array.", e );
-		}
-	}
-
 }