From 6ebbf968e77d839270f7280263518b31b2ff1cf4 Mon Sep 17 00:00:00 2001 From: Vlad Mihalcea Date: Thu, 7 Apr 2022 08:53:50 +0300 Subject: [PATCH] Rename the Hibernate 6 Dynamic mutable and immutable abstract types #419 --- ...ableType.java => ImmutableDynamicParameterizedType.java} | 6 +++--- ...utableType.java => MutableDynamicParameterizedType.java} | 6 +++--- .../hibernate/type/array/internal/AbstractArrayType.java | 4 ++-- .../hibernate/type/basic/PostgreSQLEnumType.java | 4 ++-- .../vladmihalcea/hibernate/type/json/JsonBinaryType.java | 4 ++-- .../com/vladmihalcea/hibernate/type/json/JsonBlobType.java | 4 ++-- .../hibernate/type/json/JsonNodeBinaryType.java | 4 ++-- .../hibernate/type/json/JsonNodeStringType.java | 4 ++-- .../vladmihalcea/hibernate/type/json/JsonStringType.java | 4 ++-- .../java/com/vladmihalcea/hibernate/type/json/JsonType.java | 4 ++-- .../hibernate/type/search/PostgreSQLTSVectorType.java | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) rename hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/{DynamicImmutableType.java => ImmutableDynamicParameterizedType.java} (54%) rename hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/{DynamicMutableType.java => MutableDynamicParameterizedType.java} (68%) diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/DynamicImmutableType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/ImmutableDynamicParameterizedType.java similarity index 54% rename from hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/DynamicImmutableType.java rename to hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/ImmutableDynamicParameterizedType.java index 40a6f040f..1e63bb79a 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/DynamicImmutableType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/ImmutableDynamicParameterizedType.java @@ -6,19 +6,19 @@ /** * @author Vlad Mihalcea */ -public abstract class DynamicImmutableType extends ImmutableType implements DynamicParameterizedType { +public abstract class ImmutableDynamicParameterizedType extends ImmutableType implements DynamicParameterizedType { /** * {@inheritDoc} */ - public DynamicImmutableType(Class clazz) { + public ImmutableDynamicParameterizedType(Class clazz) { super(clazz); } /** * {@inheritDoc} */ - public DynamicImmutableType(Class clazz, Configuration configuration) { + public ImmutableDynamicParameterizedType(Class clazz, Configuration configuration) { super(clazz, configuration); } } \ No newline at end of file diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/DynamicMutableType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/MutableDynamicParameterizedType.java similarity index 68% rename from hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/DynamicMutableType.java rename to hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/MutableDynamicParameterizedType.java index 88bb26b08..745c55112 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/DynamicMutableType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/MutableDynamicParameterizedType.java @@ -12,16 +12,16 @@ /** * @author Vlad Mihalcea */ -public class DynamicMutableType> extends MutableType implements DynamicParameterizedType { +public class MutableDynamicParameterizedType> extends MutableType implements DynamicParameterizedType { /** * {@inheritDoc} */ - public DynamicMutableType(Class returnedClass, JDBC jdbcTypeDescriptor, JAVA javaTypeDescriptor) { + public MutableDynamicParameterizedType(Class returnedClass, JDBC jdbcTypeDescriptor, JAVA javaTypeDescriptor) { super(returnedClass, jdbcTypeDescriptor, javaTypeDescriptor); } - public DynamicMutableType(Class returnedClass, JDBC jdbcTypeDescriptor, JAVA javaTypeDescriptor, Configuration configuration) { + public MutableDynamicParameterizedType(Class returnedClass, JDBC jdbcTypeDescriptor, JAVA javaTypeDescriptor, Configuration configuration) { super(returnedClass, jdbcTypeDescriptor, javaTypeDescriptor, configuration); } diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/array/internal/AbstractArrayType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/array/internal/AbstractArrayType.java index c715897be..2f1f9fa0e 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/array/internal/AbstractArrayType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/array/internal/AbstractArrayType.java @@ -1,6 +1,6 @@ package com.vladmihalcea.hibernate.type.array.internal; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.util.Configuration; /** @@ -9,7 +9,7 @@ * @author Vlad Mihalcea */ public abstract class AbstractArrayType - extends DynamicMutableType> { + extends MutableDynamicParameterizedType> { public static final String SQL_ARRAY_TYPE = "sql_array_type"; diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLEnumType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLEnumType.java index 79991702e..ae01cf677 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLEnumType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLEnumType.java @@ -1,6 +1,6 @@ package com.vladmihalcea.hibernate.type.basic; -import com.vladmihalcea.hibernate.type.DynamicImmutableType; +import com.vladmihalcea.hibernate.type.ImmutableDynamicParameterizedType; import com.vladmihalcea.hibernate.util.ReflectionUtils; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; @@ -26,7 +26,7 @@ * * @author Vlad Mihalcea */ -public class PostgreSQLEnumType extends DynamicImmutableType { +public class PostgreSQLEnumType extends ImmutableDynamicParameterizedType { public static final PostgreSQLEnumType INSTANCE = new PostgreSQLEnumType(); diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBinaryType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBinaryType.java index 325885f55..7ee87de35 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBinaryType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBinaryType.java @@ -1,7 +1,7 @@ package com.vladmihalcea.hibernate.type.json; import com.fasterxml.jackson.databind.ObjectMapper; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.json.internal.JsonBinaryJdbcTypeDescriptor; import com.vladmihalcea.hibernate.type.json.internal.JsonJavaTypeDescriptor; import com.vladmihalcea.hibernate.type.util.Configuration; @@ -25,7 +25,7 @@ * * @author Vlad Mihalcea */ -public class JsonBinaryType extends DynamicMutableType { +public class JsonBinaryType extends MutableDynamicParameterizedType { public static final JsonBinaryType INSTANCE = new JsonBinaryType(); diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBlobType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBlobType.java index c47ffaa71..45ca7b965 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBlobType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonBlobType.java @@ -1,7 +1,7 @@ package com.vladmihalcea.hibernate.type.json; import com.fasterxml.jackson.databind.ObjectMapper; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.json.internal.JsonJavaTypeDescriptor; import com.vladmihalcea.hibernate.type.util.Configuration; import com.vladmihalcea.hibernate.type.util.ObjectMapperWrapper; @@ -26,7 +26,7 @@ * * @author Vlad Mihalcea */ -public class JsonBlobType extends DynamicMutableType { +public class JsonBlobType extends MutableDynamicParameterizedType { public static final JsonBlobType INSTANCE = new JsonBlobType(); diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeBinaryType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeBinaryType.java index 939126958..d49da074c 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeBinaryType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeBinaryType.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.json.internal.JsonBinaryJdbcTypeDescriptor; import com.vladmihalcea.hibernate.type.json.internal.JsonNodeJavaTypeDescriptor; import com.vladmihalcea.hibernate.type.util.Configuration; @@ -24,7 +24,7 @@ * * @author Vlad Mihalcea */ -public class JsonNodeBinaryType extends DynamicMutableType { +public class JsonNodeBinaryType extends MutableDynamicParameterizedType { public static final JsonNodeBinaryType INSTANCE = new JsonNodeBinaryType(); diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeStringType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeStringType.java index aea933eaa..8780078f0 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeStringType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonNodeStringType.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.json.internal.JsonNodeJavaTypeDescriptor; import com.vladmihalcea.hibernate.type.json.internal.JsonStringJdbcTypeDescriptor; import com.vladmihalcea.hibernate.type.util.Configuration; @@ -24,7 +24,7 @@ * * @author Vlad Mihalcea */ -public class JsonNodeStringType extends DynamicMutableType { +public class JsonNodeStringType extends MutableDynamicParameterizedType { public static final JsonNodeStringType INSTANCE = new JsonNodeStringType(); diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonStringType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonStringType.java index 130f748ba..7b9d43e1e 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonStringType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonStringType.java @@ -1,7 +1,7 @@ package com.vladmihalcea.hibernate.type.json; import com.fasterxml.jackson.databind.ObjectMapper; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.json.internal.JsonJavaTypeDescriptor; import com.vladmihalcea.hibernate.type.json.internal.JsonStringJdbcTypeDescriptor; import com.vladmihalcea.hibernate.type.util.Configuration; @@ -32,7 +32,7 @@ * * @author Vlad Mihalcea */ -public class JsonStringType extends DynamicMutableType { +public class JsonStringType extends MutableDynamicParameterizedType { public static final JsonStringType INSTANCE = new JsonStringType(); diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonType.java index 7453c7ea7..209ecb7bf 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/json/JsonType.java @@ -1,7 +1,7 @@ package com.vladmihalcea.hibernate.type.json; import com.fasterxml.jackson.databind.ObjectMapper; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.json.internal.JsonJavaTypeDescriptor; import com.vladmihalcea.hibernate.type.json.internal.JsonJdbcTypeDescriptor; import com.vladmihalcea.hibernate.type.util.Configuration; @@ -30,7 +30,7 @@ * * @author Vlad Mihalcea */ -public class JsonType extends DynamicMutableType { +public class JsonType extends MutableDynamicParameterizedType { public static final JsonType INSTANCE = new JsonType(); diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/search/PostgreSQLTSVectorType.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/search/PostgreSQLTSVectorType.java index 43942c373..86adb82c8 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/search/PostgreSQLTSVectorType.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/search/PostgreSQLTSVectorType.java @@ -1,6 +1,6 @@ package com.vladmihalcea.hibernate.type.search; -import com.vladmihalcea.hibernate.type.DynamicMutableType; +import com.vladmihalcea.hibernate.type.MutableDynamicParameterizedType; import com.vladmihalcea.hibernate.type.search.internal.PostgreSQLTSVectorSqlTypeDescriptor; import com.vladmihalcea.hibernate.type.search.internal.PostgreSQLTSVectorTypeDescriptor; import com.vladmihalcea.hibernate.type.util.Configuration; @@ -11,7 +11,7 @@ * @author Vlad Mihalcea * @author Philip Riecks */ -public class PostgreSQLTSVectorType extends DynamicMutableType { +public class PostgreSQLTSVectorType extends MutableDynamicParameterizedType { public static final PostgreSQLTSVectorType INSTANCE = new PostgreSQLTSVectorType();