Refactor ScalarType move format() default method from ScalarTypeBase to ScalarType

This commit is contained in:
Rob Bygrave
2022-08-25 13:00:30 +12:00
parent 7d1772cb54
commit 186019da7f
9 changed files with 4 additions and 45 deletions
@@ -141,8 +141,11 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
* <p>
* This is so that ScalarType also implements the StringFormatter interface.
*/
@SuppressWarnings("unchecked")
@Override
String format(Object value);
default String format(Object value) {
return formatValue((T) value);
}
/**
* Convert the string value to the appropriate java object.
@@ -30,10 +30,4 @@ public abstract class ScalarTypeBase<T> implements ScalarType<T> {
return type;
}
@Override
@SuppressWarnings("unchecked")
public String format(Object value) {
return formatValue((T) value);
}
}
@@ -88,12 +88,6 @@ abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
return format(value);
}
@Override
@SuppressWarnings("unchecked")
public String format(Object value) {
return formatValue((T) value);
}
@Override
public T readData(DataInput dataInput) throws IOException {
if (!dataInput.readBoolean()) {
@@ -74,11 +74,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
return baseType.docType();
}
@Override
public String format(Object v) {
throw new RuntimeException("Not used");
}
@Override
public String formatValue(byte[] v) {
throw new RuntimeException("Not used");
@@ -99,12 +99,6 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
return false;
}
@Override
@SuppressWarnings("unchecked")
public String format(Object v) {
return formatValue((T) v);
}
@Override
public String formatValue(T v) {
return wrapped.formatValue(v);
@@ -63,11 +63,6 @@ class ScalarTypeNotFound implements ScalarType<Void> {
throw new UnsupportedOperationException();
}
@Override
public String format(Object value) {
throw new UnsupportedOperationException();
}
@Override
public Void parse(String value) {
throw new UnsupportedOperationException();
@@ -104,12 +104,6 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
return false;
}
@Override
@SuppressWarnings("unchecked")
public String format(Object v) {
return formatValue((B) v);
}
@Override
public String formatValue(B v) {
S sv = converter.unwrapValue(v);
@@ -101,11 +101,6 @@ abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {
return null;
}
@Override
public String format(Object value) {
return null;
}
@Override
public T parse(String value) {
return null;
@@ -92,11 +92,6 @@ abstract class ScalarTypeGeoLatteBase<T extends Geometry> implements ScalarType<
return null;
}
@Override
public String format(Object value) {
return null;
}
@Override
public T parse(String value) {
return null;