diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java index 9523fd9d5..304428924 100644 --- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java @@ -101,12 +101,6 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData @Override T read(DataReader reader) throws SQLException; - /** - * Ignore the reading of this value. Typically, this means moving the index - * position in the ResultSet. - */ - void loadIgnore(DataReader reader); - /** * Convert (if necessary) and bind the value to the preparedStatement. *

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java index a65838ead..40f092624 100644 --- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java @@ -36,9 +36,4 @@ public abstract class ScalarTypeBase implements ScalarType { return formatValue((T) value); } - @Override - public void loadIgnore(DataReader reader) { - reader.incrementPos(1); - } - } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 9468379a2..4c38bc110 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -508,7 +508,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { @Override public void loadIgnore(DbReadContext ctx) { - scalarType.loadIgnore(ctx.dataReader()); + ctx.dataReader().incrementPos(1); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java index fe06c0f4c..c8711ea62 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java @@ -65,7 +65,7 @@ abstract class DynamicPropertyBase implements STreeProperty { @Override public void loadIgnore(DbReadContext ctx) { - scalarType.loadIgnore(ctx.dataReader()); + ctx.dataReader().incrementPos(1); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java index a49ea668c..c1419e010 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java @@ -57,11 +57,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType { return baseType.jdbcNative(); } - @Override - public void loadIgnore(DataReader reader) { - baseType.loadIgnore(reader); - } - @Override public void jsonWrite(JsonGenerator writer, byte[] value) throws IOException { writer.writeBinary(value); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java index 605f1ccad..caa965190 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java @@ -99,11 +99,6 @@ public final class ScalarTypeEncryptedWrapper implements ScalarType, Local return false; } - @Override - public void loadIgnore(DataReader dataReader) { - wrapped.loadIgnore(dataReader); - } - @Override @SuppressWarnings("unchecked") public String format(Object v) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java index 4f1305144..3b84cc68b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java @@ -43,11 +43,6 @@ class ScalarTypeNotFound implements ScalarType { throw new UnsupportedOperationException(); } - @Override - public void loadIgnore(DataReader reader) { - throw new UnsupportedOperationException(); - } - @Override public void bind(DataBinder binder, Void value) throws SQLException { throw new UnsupportedOperationException(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java index 0135b6c4e..1226280e2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java @@ -134,11 +134,6 @@ public class ScalarTypeWrapper implements ScalarType { return converter.wrapValue(sv); } - @Override - public void loadIgnore(DataReader reader) { - reader.incrementPos(1); - } - @Override public B read(DataReader reader) throws SQLException { S sv = scalarType.read(reader); diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java index eb29fad3f..cd06256e5 100644 --- a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java +++ b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java @@ -86,11 +86,6 @@ abstract class ScalarTypePgisBase implements ScalarType { } - @Override - public void loadIgnore(DataReader reader) { - reader.incrementPos(1); - } - @Override public Object toJdbcType(Object value) { return null; diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java index dfdee4881..34bc43901 100644 --- a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java +++ b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java @@ -77,11 +77,6 @@ abstract class ScalarTypeGeoLatteBase implements ScalarType< } - @Override - public void loadIgnore(DataReader reader) { - reader.incrementPos(1); - } - @Override public Object toJdbcType(Object value) { return null;