diff --git a/pom.xml b/pom.xml index 71ec896..ad13223 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.ngocnhan_tran1996 + io.github.ngocnhan-tran1996 spring-jdbc-oracle - 1.0-SNAPSHOT + 1.0.0-SNAPSHOT 21 diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ClassRecord.java b/src/main/java/io/spring/jdbc/oracle/accessor/ClassRecord.java similarity index 83% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ClassRecord.java rename to src/main/java/io/spring/jdbc/oracle/accessor/ClassRecord.java index dcf051e..4495d6d 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ClassRecord.java +++ b/src/main/java/io/spring/jdbc/oracle/accessor/ClassRecord.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.accessor; +package io.spring.jdbc.oracle.accessor; import java.util.Objects; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ParameterAccessor.java b/src/main/java/io/spring/jdbc/oracle/accessor/ParameterAccessor.java similarity index 62% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ParameterAccessor.java rename to src/main/java/io/spring/jdbc/oracle/accessor/ParameterAccessor.java index 386746b..9090db8 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ParameterAccessor.java +++ b/src/main/java/io/spring/jdbc/oracle/accessor/ParameterAccessor.java @@ -1,9 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.accessor; +package io.spring.jdbc.oracle.accessor; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_NULL; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.utils.Strings; public abstract class ParameterAccessor { @@ -14,7 +12,7 @@ protected ParameterAccessor(String parameterName, Class mappedClass) { if (Strings.isBlank(parameterName)) { - throw new ValueException(NOT_NULL.formatted("parameter")); + throw new ValueException(Strings.NOT_NULL.formatted("parameter")); } this.parameterName = parameterName.toUpperCase(); diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/annotation/OracleParameter.java b/src/main/java/io/spring/jdbc/oracle/annotation/OracleParameter.java similarity index 76% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/annotation/OracleParameter.java rename to src/main/java/io/spring/jdbc/oracle/annotation/OracleParameter.java index 340c196..416057b 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/annotation/OracleParameter.java +++ b/src/main/java/io/spring/jdbc/oracle/annotation/OracleParameter.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.annotation; +package io.spring.jdbc.oracle.annotation; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.utils.Strings; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/annotation/OracleType.java b/src/main/java/io/spring/jdbc/oracle/annotation/OracleType.java similarity index 61% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/annotation/OracleType.java rename to src/main/java/io/spring/jdbc/oracle/annotation/OracleType.java index d43d289..c672aca 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/annotation/OracleType.java +++ b/src/main/java/io/spring/jdbc/oracle/annotation/OracleType.java @@ -1,8 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.annotation; +package io.spring.jdbc.oracle.annotation; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.support.NoneConverter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.converter.OracleConverter; +import io.spring.jdbc.oracle.converter.support.NoneConverter; +import io.spring.jdbc.oracle.utils.Strings; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/GenericOracleConverter.java b/src/main/java/io/spring/jdbc/oracle/converter/GenericOracleConverter.java similarity index 78% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/GenericOracleConverter.java rename to src/main/java/io/spring/jdbc/oracle/converter/GenericOracleConverter.java index b64f71c..d3ec1c0 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/GenericOracleConverter.java +++ b/src/main/java/io/spring/jdbc/oracle/converter/GenericOracleConverter.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.converter; +package io.spring.jdbc.oracle.converter; import org.springframework.core.convert.TypeDescriptor; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/OracleConverter.java b/src/main/java/io/spring/jdbc/oracle/converter/OracleConverter.java similarity index 60% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/OracleConverter.java rename to src/main/java/io/spring/jdbc/oracle/converter/OracleConverter.java index 82f26e9..61c0a1e 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/OracleConverter.java +++ b/src/main/java/io/spring/jdbc/oracle/converter/OracleConverter.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.converter; +package io.spring.jdbc.oracle.converter; @FunctionalInterface public interface OracleConverter { diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/OracleConverters.java b/src/main/java/io/spring/jdbc/oracle/converter/OracleConverters.java similarity index 84% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/OracleConverters.java rename to src/main/java/io/spring/jdbc/oracle/converter/OracleConverters.java index b2fcfc9..8a19444 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/OracleConverters.java +++ b/src/main/java/io/spring/jdbc/oracle/converter/OracleConverters.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.converter; +package io.spring.jdbc.oracle.converter; import org.springframework.core.convert.TypeDescriptor; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/CollectionToCollectionGenericOracleConverter.java b/src/main/java/io/spring/jdbc/oracle/converter/support/CollectionToCollectionGenericOracleConverter.java similarity index 89% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/CollectionToCollectionGenericOracleConverter.java rename to src/main/java/io/spring/jdbc/oracle/converter/support/CollectionToCollectionGenericOracleConverter.java index a2cdd59..d6d2908 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/CollectionToCollectionGenericOracleConverter.java +++ b/src/main/java/io/spring/jdbc/oracle/converter/support/CollectionToCollectionGenericOracleConverter.java @@ -1,7 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.converter.support; +package io.spring.jdbc.oracle.converter.support; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.GenericOracleConverter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverters; +import io.spring.jdbc.oracle.converter.GenericOracleConverter; +import io.spring.jdbc.oracle.converter.OracleConverters; import java.util.Collection; import java.util.Optional; import org.springframework.core.CollectionFactory; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/DefaultOracleConverters.java b/src/main/java/io/spring/jdbc/oracle/converter/support/DefaultOracleConverters.java similarity index 92% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/DefaultOracleConverters.java rename to src/main/java/io/spring/jdbc/oracle/converter/support/DefaultOracleConverters.java index 6fe9629..f72ef16 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/DefaultOracleConverters.java +++ b/src/main/java/io/spring/jdbc/oracle/converter/support/DefaultOracleConverters.java @@ -1,11 +1,10 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.converter.support; +package io.spring.jdbc.oracle.converter.support; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_NULL; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.GenericOracleConverter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverters; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.converter.GenericOracleConverter; +import io.spring.jdbc.oracle.converter.OracleConverter; +import io.spring.jdbc.oracle.converter.OracleConverters; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.utils.Strings; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -43,7 +42,7 @@ public void addGenericConverter(GenericOracleConverter genericOracleConver if (genericOracleConverter == null) { - throw new ValueException(NOT_NULL.formatted("GenericOracleConverter")); + throw new ValueException(Strings.NOT_NULL.formatted("GenericOracleConverter")); } var converterKey = this.getConvertKey( @@ -70,7 +69,7 @@ public void addConverter(OracleConverter converter) { if (converter == null) { - throw new ValueException(NOT_NULL.formatted("OracleConverter")); + throw new ValueException(Strings.NOT_NULL.formatted("OracleConverter")); } var converterKey = this.getConvertKey(converter.getClass(), OracleConverter.class); @@ -150,7 +149,7 @@ private ConvertKey getConvertKey(Class converterClass, Class genericClass) private List> getClassHierarchy(Class type) { List> hierarchy = new ArrayList<>(20); - Set> visited = new HashSet<>(20); + Set> visited = HashSet.newHashSet(20); this.addToClassHierarchy( 0, ClassUtils.resolvePrimitiveIfNecessary(type), diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/NoneConverter.java b/src/main/java/io/spring/jdbc/oracle/converter/support/NoneConverter.java similarity index 53% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/NoneConverter.java rename to src/main/java/io/spring/jdbc/oracle/converter/support/NoneConverter.java index e43c82b..930c7d7 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/NoneConverter.java +++ b/src/main/java/io/spring/jdbc/oracle/converter/support/NoneConverter.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.converter.support; +package io.spring.jdbc.oracle.converter.support; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverter; +import io.spring.jdbc.oracle.converter.OracleConverter; public class NoneConverter implements OracleConverter { diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/NumberToStringGenericOracleConverter.java b/src/main/java/io/spring/jdbc/oracle/converter/support/NumberToStringGenericOracleConverter.java similarity index 80% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/NumberToStringGenericOracleConverter.java rename to src/main/java/io/spring/jdbc/oracle/converter/support/NumberToStringGenericOracleConverter.java index 491413e..0f47950 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/converter/support/NumberToStringGenericOracleConverter.java +++ b/src/main/java/io/spring/jdbc/oracle/converter/support/NumberToStringGenericOracleConverter.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.converter.support; +package io.spring.jdbc.oracle.converter.support; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.GenericOracleConverter; +import io.spring.jdbc.oracle.converter.GenericOracleConverter; import java.util.Optional; import org.springframework.core.convert.TypeDescriptor; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/exception/ValueException.java b/src/main/java/io/spring/jdbc/oracle/exception/ValueException.java similarity index 69% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/exception/ValueException.java rename to src/main/java/io/spring/jdbc/oracle/exception/ValueException.java index 2591d1d..e0bb6fa 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/exception/ValueException.java +++ b/src/main/java/io/spring/jdbc/oracle/exception/ValueException.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.exception; +package io.spring.jdbc.oracle.exception; public class ValueException extends RuntimeException { diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/AbstractMapper.java b/src/main/java/io/spring/jdbc/oracle/mapper/AbstractMapper.java similarity index 95% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/AbstractMapper.java rename to src/main/java/io/spring/jdbc/oracle/mapper/AbstractMapper.java index 233db42..9e0e622 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/AbstractMapper.java +++ b/src/main/java/io/spring/jdbc/oracle/mapper/AbstractMapper.java @@ -1,8 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper; +package io.spring.jdbc.oracle.mapper; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Matchers.not; +import static io.spring.jdbc.oracle.utils.Matchers.not; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.utils.Strings; import java.sql.Connection; import java.sql.ResultSetMetaData; import java.sql.SQLException; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/BeanPropertyMapper.java b/src/main/java/io/spring/jdbc/oracle/mapper/BeanPropertyMapper.java similarity index 87% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/BeanPropertyMapper.java rename to src/main/java/io/spring/jdbc/oracle/mapper/BeanPropertyMapper.java index 4d706b8..812dee3 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/BeanPropertyMapper.java +++ b/src/main/java/io/spring/jdbc/oracle/mapper/BeanPropertyMapper.java @@ -1,22 +1,21 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper; - -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Matchers.not; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.accessor.ClassRecord; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleParameter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleType; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverters; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.support.DefaultOracleConverters; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.support.NoneConverter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.property.MapperProperty; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.property.TypeProperty; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.property.TypeProperty.Types; -import io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input.ParameterInput; -import io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output.ParameterOutput; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.MapperUtils; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +package io.spring.jdbc.oracle.mapper; + +import io.spring.jdbc.oracle.accessor.ClassRecord; +import io.spring.jdbc.oracle.annotation.OracleParameter; +import io.spring.jdbc.oracle.annotation.OracleType; +import io.spring.jdbc.oracle.converter.OracleConverter; +import io.spring.jdbc.oracle.converter.OracleConverters; +import io.spring.jdbc.oracle.converter.support.DefaultOracleConverters; +import io.spring.jdbc.oracle.converter.support.NoneConverter; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.property.MapperProperty; +import io.spring.jdbc.oracle.mapper.property.TypeProperty; +import io.spring.jdbc.oracle.mapper.property.TypeProperty.Types; +import io.spring.jdbc.oracle.parameter.input.ParameterInput; +import io.spring.jdbc.oracle.parameter.output.ParameterOutput; +import io.spring.jdbc.oracle.utils.MapperUtils; +import io.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.utils.Matchers; import java.beans.PropertyDescriptor; import java.sql.Connection; import java.util.List; @@ -125,7 +124,7 @@ protected Object[] toStruct( this.readProperties.forEach((columnName, typeProperty) -> { - if (not(columnNameByIndex.containsKey(columnName))) { + if (Matchers.not(columnNameByIndex.containsKey(columnName))) { return; } @@ -182,7 +181,7 @@ protected T constructInstance(Connection connection, Map val this.writeProperties.forEach((columnName, typeProperty) -> { - if (not(valueByName.containsKey(columnName))) { + if (Matchers.not(valueByName.containsKey(columnName))) { return; } diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/DelegateMapper.java b/src/main/java/io/spring/jdbc/oracle/mapper/DelegateMapper.java similarity index 88% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/DelegateMapper.java rename to src/main/java/io/spring/jdbc/oracle/mapper/DelegateMapper.java index 5e41324..8c72dda 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/DelegateMapper.java +++ b/src/main/java/io/spring/jdbc/oracle/mapper/DelegateMapper.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper; +package io.spring.jdbc.oracle.mapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.accessor.ClassRecord; +import io.spring.jdbc.oracle.accessor.ClassRecord; import java.sql.Connection; import java.sql.Struct; import java.util.Map; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/Mapper.java b/src/main/java/io/spring/jdbc/oracle/mapper/Mapper.java similarity index 83% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/Mapper.java rename to src/main/java/io/spring/jdbc/oracle/mapper/Mapper.java index e3c6b7a..356ffe3 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/Mapper.java +++ b/src/main/java/io/spring/jdbc/oracle/mapper/Mapper.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper; +package io.spring.jdbc.oracle.mapper; import java.sql.Connection; import java.sql.Struct; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/RecordPropertyMapper.java b/src/main/java/io/spring/jdbc/oracle/mapper/RecordPropertyMapper.java similarity index 91% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/RecordPropertyMapper.java rename to src/main/java/io/spring/jdbc/oracle/mapper/RecordPropertyMapper.java index ab6c8d5..f48957d 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/RecordPropertyMapper.java +++ b/src/main/java/io/spring/jdbc/oracle/mapper/RecordPropertyMapper.java @@ -1,8 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper; +package io.spring.jdbc.oracle.mapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleParameter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.property.TypeProperty; +import io.spring.jdbc.oracle.annotation.OracleParameter; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.property.TypeProperty; import java.beans.PropertyDescriptor; import java.lang.reflect.Constructor; import java.sql.Connection; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/property/MapperProperty.java b/src/main/java/io/spring/jdbc/oracle/mapper/property/MapperProperty.java similarity index 70% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/property/MapperProperty.java rename to src/main/java/io/spring/jdbc/oracle/mapper/property/MapperProperty.java index ccd1528..c5bf90a 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/property/MapperProperty.java +++ b/src/main/java/io/spring/jdbc/oracle/mapper/property/MapperProperty.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.property; +package io.spring.jdbc.oracle.mapper.property; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/property/TypeProperty.java b/src/main/java/io/spring/jdbc/oracle/mapper/property/TypeProperty.java similarity index 90% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/property/TypeProperty.java rename to src/main/java/io/spring/jdbc/oracle/mapper/property/TypeProperty.java index 97d2011..25f42a2 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/property/TypeProperty.java +++ b/src/main/java/io/spring/jdbc/oracle/mapper/property/TypeProperty.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.property; +package io.spring.jdbc.oracle.mapper.property; -import io.ngocnhan_tran1996.spring.jdbc.oracle.converter.OracleConverter; +import io.spring.jdbc.oracle.converter.OracleConverter; public class TypeProperty { diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/AbstractTypeValue.java b/src/main/java/io/spring/jdbc/oracle/parameter/input/AbstractTypeValue.java similarity index 83% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/AbstractTypeValue.java rename to src/main/java/io/spring/jdbc/oracle/parameter/input/AbstractTypeValue.java index 85a9c2c..f7fa4d4 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/AbstractTypeValue.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/input/AbstractTypeValue.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; +package io.spring.jdbc.oracle.parameter.input; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.utils.Strings; import java.sql.Connection; import java.sql.SQLException; import org.springframework.jdbc.core.support.AbstractSqlTypeValue; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ArrayTypeValue.java b/src/main/java/io/spring/jdbc/oracle/parameter/input/ArrayTypeValue.java similarity index 73% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ArrayTypeValue.java rename to src/main/java/io/spring/jdbc/oracle/parameter/input/ArrayTypeValue.java index 212ba70..70c83d8 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ArrayTypeValue.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/input/ArrayTypeValue.java @@ -1,9 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; +package io.spring.jdbc.oracle.parameter.input; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_BLANK; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.utils.Strings; import java.sql.Connection; import java.sql.SQLException; import java.util.Collection; @@ -18,7 +16,7 @@ class ArrayTypeValue extends AbstractTypeValue { if (Strings.isBlank(arrayTypeName)) { - throw new ValueException(NOT_BLANK.formatted("arrayTypeName")); + throw new ValueException(Strings.NOT_BLANK.formatted("arrayTypeName")); } this.arrayTypeName = arrayTypeName.toUpperCase(); diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ParameterInput.java b/src/main/java/io/spring/jdbc/oracle/parameter/input/ParameterInput.java similarity index 89% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ParameterInput.java rename to src/main/java/io/spring/jdbc/oracle/parameter/input/ParameterInput.java index 653b641..4c86e0f 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ParameterInput.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/input/ParameterInput.java @@ -1,12 +1,11 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; - -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_NULL; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.accessor.ParameterAccessor; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.DelegateMapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.Mapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output.ParameterOutput; +package io.spring.jdbc.oracle.parameter.input; + +import io.spring.jdbc.oracle.accessor.ParameterAccessor; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.DelegateMapper; +import io.spring.jdbc.oracle.mapper.Mapper; +import io.spring.jdbc.oracle.parameter.output.ParameterOutput; +import io.spring.jdbc.oracle.utils.Strings; import java.sql.Connection; import java.sql.Types; import java.util.ArrayList; @@ -185,7 +184,7 @@ private void validateTypeValue() { if (this.type == null) { - throw new ValueException(NOT_NULL.formatted("typeValue")); + throw new ValueException(Strings.NOT_NULL.formatted("typeValue")); } } diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructArrayTypeValue.java b/src/main/java/io/spring/jdbc/oracle/parameter/input/StructArrayTypeValue.java similarity index 75% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructArrayTypeValue.java rename to src/main/java/io/spring/jdbc/oracle/parameter/input/StructArrayTypeValue.java index 9e65813..a9d6e56 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructArrayTypeValue.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/input/StructArrayTypeValue.java @@ -1,10 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; +package io.spring.jdbc.oracle.parameter.input; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_BLANK; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.Mapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.Mapper; +import io.spring.jdbc.oracle.utils.Strings; import java.sql.Connection; import java.sql.SQLException; import java.sql.Struct; @@ -26,7 +24,7 @@ class StructArrayTypeValue extends ArrayTypeValue { super(arrayTypeName, values); if (Strings.isBlank(structTypeName)) { - throw new ValueException(NOT_BLANK.formatted("structTypeName")); + throw new ValueException(Strings.NOT_BLANK.formatted("structTypeName")); } this.structTypeName = structTypeName.toUpperCase(); this.mapper = mapper; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructTypeValue.java b/src/main/java/io/spring/jdbc/oracle/parameter/input/StructTypeValue.java similarity index 55% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructTypeValue.java rename to src/main/java/io/spring/jdbc/oracle/parameter/input/StructTypeValue.java index a5a06f1..4f525b1 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructTypeValue.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/input/StructTypeValue.java @@ -1,11 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; +package io.spring.jdbc.oracle.parameter.input; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_BLANK; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_NULL; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.Mapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.Mapper; +import io.spring.jdbc.oracle.utils.Strings; import java.sql.Connection; import java.util.Objects; @@ -19,12 +16,12 @@ class StructTypeValue extends AbstractTypeValue { if (Strings.isBlank(structTypeName)) { - throw new ValueException(NOT_BLANK.formatted("structTypeName")); + throw new ValueException(Strings.NOT_BLANK.formatted("structTypeName")); } this.structTypeName = structTypeName.toUpperCase(); this.value = value; - this.mapper = Objects.requireNonNull(mapper, NOT_NULL.formatted("mapper")); + this.mapper = Objects.requireNonNull(mapper, Strings.NOT_NULL.formatted("mapper")); } @Override diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/AbstractReturnType.java b/src/main/java/io/spring/jdbc/oracle/parameter/output/AbstractReturnType.java similarity index 94% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/AbstractReturnType.java rename to src/main/java/io/spring/jdbc/oracle/parameter/output/AbstractReturnType.java index c2f4ca4..195406f 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/AbstractReturnType.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/output/AbstractReturnType.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; import java.sql.Array; import java.sql.CallableStatement; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ArrayReturnType.java b/src/main/java/io/spring/jdbc/oracle/parameter/output/ArrayReturnType.java similarity index 84% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ArrayReturnType.java rename to src/main/java/io/spring/jdbc/oracle/parameter/output/ArrayReturnType.java index 60447d7..6349aa3 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ArrayReturnType.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/output/ArrayReturnType.java @@ -1,8 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Matchers.not; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.utils.Matchers; import java.sql.Array; import java.sql.Connection; import java.sql.SQLException; @@ -23,7 +22,7 @@ class ArrayReturnType extends AbstractReturnType { ArrayReturnType(Class targetType) { - if (targetType != null && not(Collection.class.isAssignableFrom(targetType))) { + if (targetType != null && Matchers.not(Collection.class.isAssignableFrom(targetType))) { throw new ValueException("targetType must extend from Collection class"); } diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ParameterOutput.java b/src/main/java/io/spring/jdbc/oracle/parameter/output/ParameterOutput.java similarity index 81% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ParameterOutput.java rename to src/main/java/io/spring/jdbc/oracle/parameter/output/ParameterOutput.java index b66cdf9..533627c 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ParameterOutput.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/output/ParameterOutput.java @@ -1,12 +1,10 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings.NOT_NULL; - -import io.ngocnhan_tran1996.spring.jdbc.oracle.accessor.ParameterAccessor; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.DelegateMapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.Mapper; -import io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Strings; +import io.spring.jdbc.oracle.accessor.ParameterAccessor; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.DelegateMapper; +import io.spring.jdbc.oracle.mapper.Mapper; +import io.spring.jdbc.oracle.utils.Strings; import java.sql.Array; import java.sql.Connection; import java.sql.Struct; @@ -96,7 +94,7 @@ private void validateReturnType() { if (Strings.isBlank(this.typeName)) { - throw new ValueException(NOT_NULL.formatted("returnType")); + throw new ValueException(Strings.NOT_NULL.formatted("returnType")); } } diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructArrayReturnType.java b/src/main/java/io/spring/jdbc/oracle/parameter/output/StructArrayReturnType.java similarity index 86% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructArrayReturnType.java rename to src/main/java/io/spring/jdbc/oracle/parameter/output/StructArrayReturnType.java index 45c4604..d594d15 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructArrayReturnType.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/output/StructArrayReturnType.java @@ -1,7 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.Mapper; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.Mapper; import java.sql.Array; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructReturnType.java b/src/main/java/io/spring/jdbc/oracle/parameter/output/StructReturnType.java similarity index 64% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructReturnType.java rename to src/main/java/io/spring/jdbc/oracle/parameter/output/StructReturnType.java index 147a552..f916aaa 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructReturnType.java +++ b/src/main/java/io/spring/jdbc/oracle/parameter/output/StructReturnType.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.Mapper; +import io.spring.jdbc.oracle.mapper.Mapper; import java.sql.Types; class StructReturnType extends StructArrayReturnType { diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/MapperUtils.java b/src/main/java/io/spring/jdbc/oracle/utils/MapperUtils.java similarity index 95% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/MapperUtils.java rename to src/main/java/io/spring/jdbc/oracle/utils/MapperUtils.java index d4a2479..6bb7663 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/MapperUtils.java +++ b/src/main/java/io/spring/jdbc/oracle/utils/MapperUtils.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.utils; +package io.spring.jdbc.oracle.utils; import java.util.Collection; import java.util.Objects; diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/Matchers.java b/src/main/java/io/spring/jdbc/oracle/utils/Matchers.java similarity index 73% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/Matchers.java rename to src/main/java/io/spring/jdbc/oracle/utils/Matchers.java index 07fc6bc..bc7affc 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/Matchers.java +++ b/src/main/java/io/spring/jdbc/oracle/utils/Matchers.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.utils; +package io.spring.jdbc.oracle.utils; public final class Matchers { diff --git a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/Strings.java b/src/main/java/io/spring/jdbc/oracle/utils/Strings.java similarity index 89% rename from src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/Strings.java rename to src/main/java/io/spring/jdbc/oracle/utils/Strings.java index 8209031..7eb2d32 100644 --- a/src/main/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/Strings.java +++ b/src/main/java/io/spring/jdbc/oracle/utils/Strings.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.utils; +package io.spring.jdbc.oracle.utils; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Matchers.not; +import static io.spring.jdbc.oracle.utils.Matchers.not; import java.util.Arrays; import java.util.Optional; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ComplexCustomer.java b/src/test/java/io/spring/jdbc/oracle/ComplexCustomer.java similarity index 93% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ComplexCustomer.java rename to src/test/java/io/spring/jdbc/oracle/ComplexCustomer.java index c8c24d1..07f154f 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ComplexCustomer.java +++ b/src/test/java/io/spring/jdbc/oracle/ComplexCustomer.java @@ -1,7 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle; +package io.spring.jdbc.oracle; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleParameter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleType; +import io.spring.jdbc.oracle.annotation.OracleParameter; +import io.spring.jdbc.oracle.annotation.OracleType; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.List; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ComplexCustomerRecord.java b/src/test/java/io/spring/jdbc/oracle/ComplexCustomerRecord.java similarity index 85% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ComplexCustomerRecord.java rename to src/test/java/io/spring/jdbc/oracle/ComplexCustomerRecord.java index 41f7ccb..a8989c6 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ComplexCustomerRecord.java +++ b/src/test/java/io/spring/jdbc/oracle/ComplexCustomerRecord.java @@ -1,7 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle; +package io.spring.jdbc.oracle; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleParameter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleType; +import io.spring.jdbc.oracle.annotation.OracleParameter; +import io.spring.jdbc.oracle.annotation.OracleType; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.List; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/Customer.java b/src/test/java/io/spring/jdbc/oracle/Customer.java similarity index 86% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/Customer.java rename to src/test/java/io/spring/jdbc/oracle/Customer.java index 0f0b823..03bf434 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/Customer.java +++ b/src/test/java/io/spring/jdbc/oracle/Customer.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle; +package io.spring.jdbc.oracle; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleParameter; +import io.spring.jdbc.oracle.annotation.OracleParameter; import java.math.BigDecimal; public class Customer { diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/CustomerRecord.java b/src/test/java/io/spring/jdbc/oracle/CustomerRecord.java similarity index 56% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/CustomerRecord.java rename to src/test/java/io/spring/jdbc/oracle/CustomerRecord.java index 591b032..6f25936 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/CustomerRecord.java +++ b/src/test/java/io/spring/jdbc/oracle/CustomerRecord.java @@ -1,6 +1,6 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle; +package io.spring.jdbc.oracle; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleParameter; +import io.spring.jdbc.oracle.annotation.OracleParameter; import java.math.BigDecimal; public record CustomerRecord( diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ExampleApplication.java b/src/test/java/io/spring/jdbc/oracle/ExampleApplication.java similarity index 85% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ExampleApplication.java rename to src/test/java/io/spring/jdbc/oracle/ExampleApplication.java index a9ce38e..dc07722 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/ExampleApplication.java +++ b/src/test/java/io/spring/jdbc/oracle/ExampleApplication.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle; +package io.spring.jdbc.oracle; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/SetupTestData.java b/src/test/java/io/spring/jdbc/oracle/SetupTestData.java similarity index 96% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/SetupTestData.java rename to src/test/java/io/spring/jdbc/oracle/SetupTestData.java index b6398c8..c467036 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/SetupTestData.java +++ b/src/test/java/io/spring/jdbc/oracle/SetupTestData.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle; +package io.spring.jdbc.oracle; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ClassRecordTest.java b/src/test/java/io/spring/jdbc/oracle/accessor/ClassRecordTest.java similarity index 94% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ClassRecordTest.java rename to src/test/java/io/spring/jdbc/oracle/accessor/ClassRecordTest.java index 7a2b883..bcf3544 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ClassRecordTest.java +++ b/src/test/java/io/spring/jdbc/oracle/accessor/ClassRecordTest.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.accessor; +package io.spring.jdbc.oracle.accessor; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNullPointerException; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ParameterAccessorTest.java b/src/test/java/io/spring/jdbc/oracle/accessor/ParameterAccessorTest.java similarity index 92% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ParameterAccessorTest.java rename to src/test/java/io/spring/jdbc/oracle/accessor/ParameterAccessorTest.java index 0a1053f..c556d3b 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/accessor/ParameterAccessorTest.java +++ b/src/test/java/io/spring/jdbc/oracle/accessor/ParameterAccessorTest.java @@ -1,10 +1,10 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.accessor; +package io.spring.jdbc.oracle.accessor; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.exception.ValueException; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/config/ExampleConfig.java b/src/test/java/io/spring/jdbc/oracle/config/ExampleConfig.java similarity index 94% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/config/ExampleConfig.java rename to src/test/java/io/spring/jdbc/oracle/config/ExampleConfig.java index 270b6e4..80431ab 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/config/ExampleConfig.java +++ b/src/test/java/io/spring/jdbc/oracle/config/ExampleConfig.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.config; +package io.spring.jdbc.oracle.config; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/DelegateMapperTest.java b/src/test/java/io/spring/jdbc/oracle/mapper/DelegateMapperTest.java similarity index 95% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/DelegateMapperTest.java rename to src/test/java/io/spring/jdbc/oracle/mapper/DelegateMapperTest.java index ca3f5bf..8ae4771 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/mapper/DelegateMapperTest.java +++ b/src/test/java/io/spring/jdbc/oracle/mapper/DelegateMapperTest.java @@ -1,15 +1,15 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.mapper; +package io.spring.jdbc.oracle.mapper; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import com.zaxxer.hikari.HikariDataSource; -import io.ngocnhan_tran1996.spring.jdbc.oracle.Customer; -import io.ngocnhan_tran1996.spring.jdbc.oracle.CustomerRecord; -import io.ngocnhan_tran1996.spring.jdbc.oracle.SetupTestData; -import io.ngocnhan_tran1996.spring.jdbc.oracle.annotation.OracleParameter; -import io.ngocnhan_tran1996.spring.jdbc.oracle.config.ExampleConfig; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.Customer; +import io.spring.jdbc.oracle.CustomerRecord; +import io.spring.jdbc.oracle.SetupTestData; +import io.spring.jdbc.oracle.annotation.OracleParameter; +import io.spring.jdbc.oracle.config.ExampleConfig; +import io.spring.jdbc.oracle.exception.ValueException; import java.math.BigDecimal; import java.sql.DriverManager; import java.sql.SQLException; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ArrayTypeValueTest.java b/src/test/java/io/spring/jdbc/oracle/parameter/input/ArrayTypeValueTest.java similarity index 86% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ArrayTypeValueTest.java rename to src/test/java/io/spring/jdbc/oracle/parameter/input/ArrayTypeValueTest.java index bb57da0..3bc3593 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ArrayTypeValueTest.java +++ b/src/test/java/io/spring/jdbc/oracle/parameter/input/ArrayTypeValueTest.java @@ -1,10 +1,10 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; +package io.spring.jdbc.oracle.parameter.input; import static org.assertj.core.api.Assertions.assertThat; import com.zaxxer.hikari.HikariDataSource; -import io.ngocnhan_tran1996.spring.jdbc.oracle.SetupTestData; -import io.ngocnhan_tran1996.spring.jdbc.oracle.config.ExampleConfig; +import io.spring.jdbc.oracle.SetupTestData; +import io.spring.jdbc.oracle.config.ExampleConfig; import java.sql.SQLException; import oracle.jdbc.OracleConnection; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ParameterInputTest.java b/src/test/java/io/spring/jdbc/oracle/parameter/input/ParameterInputTest.java similarity index 91% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ParameterInputTest.java rename to src/test/java/io/spring/jdbc/oracle/parameter/input/ParameterInputTest.java index bd5da09..d549771 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/ParameterInputTest.java +++ b/src/test/java/io/spring/jdbc/oracle/parameter/input/ParameterInputTest.java @@ -1,8 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; +package io.spring.jdbc.oracle.parameter.input; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.exception.ValueException; import java.util.Collections; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructArrayTypeValueTest.java b/src/test/java/io/spring/jdbc/oracle/parameter/input/StructArrayTypeValueTest.java similarity index 81% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructArrayTypeValueTest.java rename to src/test/java/io/spring/jdbc/oracle/parameter/input/StructArrayTypeValueTest.java index a700405..de4434c 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/input/StructArrayTypeValueTest.java +++ b/src/test/java/io/spring/jdbc/oracle/parameter/input/StructArrayTypeValueTest.java @@ -1,12 +1,12 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input; +package io.spring.jdbc.oracle.parameter.input; import static org.assertj.core.api.Assertions.assertThat; import com.zaxxer.hikari.HikariDataSource; -import io.ngocnhan_tran1996.spring.jdbc.oracle.Customer; -import io.ngocnhan_tran1996.spring.jdbc.oracle.SetupTestData; -import io.ngocnhan_tran1996.spring.jdbc.oracle.config.ExampleConfig; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.DelegateMapper; +import io.spring.jdbc.oracle.Customer; +import io.spring.jdbc.oracle.SetupTestData; +import io.spring.jdbc.oracle.config.ExampleConfig; +import io.spring.jdbc.oracle.mapper.DelegateMapper; import java.sql.SQLException; import oracle.jdbc.OracleConnection; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ArrayReturnTypeTest.java b/src/test/java/io/spring/jdbc/oracle/parameter/output/ArrayReturnTypeTest.java similarity index 89% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ArrayReturnTypeTest.java rename to src/test/java/io/spring/jdbc/oracle/parameter/output/ArrayReturnTypeTest.java index 14c3d61..a58a6f1 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ArrayReturnTypeTest.java +++ b/src/test/java/io/spring/jdbc/oracle/parameter/output/ArrayReturnTypeTest.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ParameterOutputTest.java b/src/test/java/io/spring/jdbc/oracle/parameter/output/ParameterOutputTest.java similarity index 84% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ParameterOutputTest.java rename to src/test/java/io/spring/jdbc/oracle/parameter/output/ParameterOutputTest.java index 4eada71..ca7cac0 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/ParameterOutputTest.java +++ b/src/test/java/io/spring/jdbc/oracle/parameter/output/ParameterOutputTest.java @@ -1,8 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.exception.ValueException; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructArrayReturnTypeTest.java b/src/test/java/io/spring/jdbc/oracle/parameter/output/StructArrayReturnTypeTest.java similarity index 80% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructArrayReturnTypeTest.java rename to src/test/java/io/spring/jdbc/oracle/parameter/output/StructArrayReturnTypeTest.java index 569b5a6..4bbfc74 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/parameter/output/StructArrayReturnTypeTest.java +++ b/src/test/java/io/spring/jdbc/oracle/parameter/output/StructArrayReturnTypeTest.java @@ -1,13 +1,13 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output; +package io.spring.jdbc.oracle.parameter.output; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import com.zaxxer.hikari.HikariDataSource; -import io.ngocnhan_tran1996.spring.jdbc.oracle.Customer; -import io.ngocnhan_tran1996.spring.jdbc.oracle.SetupTestData; -import io.ngocnhan_tran1996.spring.jdbc.oracle.config.ExampleConfig; -import io.ngocnhan_tran1996.spring.jdbc.oracle.exception.ValueException; -import io.ngocnhan_tran1996.spring.jdbc.oracle.mapper.DelegateMapper; +import io.spring.jdbc.oracle.Customer; +import io.spring.jdbc.oracle.SetupTestData; +import io.spring.jdbc.oracle.config.ExampleConfig; +import io.spring.jdbc.oracle.exception.ValueException; +import io.spring.jdbc.oracle.mapper.DelegateMapper; import java.math.BigDecimal; import java.sql.SQLException; import oracle.jdbc.OracleConnection; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ComplexExampleService.java b/src/test/java/io/spring/jdbc/oracle/service/ComplexExampleService.java similarity index 92% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ComplexExampleService.java rename to src/test/java/io/spring/jdbc/oracle/service/ComplexExampleService.java index 6888a7f..2d82c87 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ComplexExampleService.java +++ b/src/test/java/io/spring/jdbc/oracle/service/ComplexExampleService.java @@ -1,8 +1,8 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.service; +package io.spring.jdbc.oracle.service; -import io.ngocnhan_tran1996.spring.jdbc.oracle.accessor.ClassRecord; -import io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input.ParameterInput; -import io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output.ParameterOutput; +import io.spring.jdbc.oracle.accessor.ClassRecord; +import io.spring.jdbc.oracle.parameter.input.ParameterInput; +import io.spring.jdbc.oracle.parameter.output.ParameterOutput; import java.lang.reflect.Array; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ComplexExampleServiceTest.java b/src/test/java/io/spring/jdbc/oracle/service/ComplexExampleServiceTest.java similarity index 87% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ComplexExampleServiceTest.java rename to src/test/java/io/spring/jdbc/oracle/service/ComplexExampleServiceTest.java index c7eff92..8f965dc 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ComplexExampleServiceTest.java +++ b/src/test/java/io/spring/jdbc/oracle/service/ComplexExampleServiceTest.java @@ -1,11 +1,12 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.service; +package io.spring.jdbc.oracle.service; import static org.assertj.core.api.Assertions.assertThat; -import io.ngocnhan_tran1996.spring.jdbc.oracle.ComplexCustomer; -import io.ngocnhan_tran1996.spring.jdbc.oracle.ComplexCustomerRecord; -import io.ngocnhan_tran1996.spring.jdbc.oracle.SetupTestData; -import io.ngocnhan_tran1996.spring.jdbc.oracle.config.ExampleConfig; +import io.spring.jdbc.oracle.ComplexCustomer; +import io.spring.jdbc.oracle.ComplexCustomerRecord; +import io.spring.jdbc.oracle.SetupTestData; +import io.spring.jdbc.oracle.config.ExampleConfig; +import io.spring.jdbc.oracle.ComplexCustomerRecord.Address; import java.math.BigDecimal; import java.sql.Timestamp; import java.time.LocalDate; @@ -64,7 +65,7 @@ void with_type_Pojo() throws NoSuchMethodException { void with_type_Record() throws NoSuchMethodException { // arrange - var address = new ComplexCustomerRecord.Address( + var address = new Address( "district", "city", List.of("1", "2") diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ExampleService.java b/src/test/java/io/spring/jdbc/oracle/service/ExampleService.java similarity index 95% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ExampleService.java rename to src/test/java/io/spring/jdbc/oracle/service/ExampleService.java index 3a32cc6..0fc3caf 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ExampleService.java +++ b/src/test/java/io/spring/jdbc/oracle/service/ExampleService.java @@ -1,7 +1,7 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.service; +package io.spring.jdbc.oracle.service; -import io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.input.ParameterInput; -import io.ngocnhan_tran1996.spring.jdbc.oracle.parameter.output.ParameterOutput; +import io.spring.jdbc.oracle.parameter.input.ParameterInput; +import io.spring.jdbc.oracle.parameter.output.ParameterOutput; import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ExampleServiceTest.java b/src/test/java/io/spring/jdbc/oracle/service/ExampleServiceTest.java similarity index 90% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ExampleServiceTest.java rename to src/test/java/io/spring/jdbc/oracle/service/ExampleServiceTest.java index 11801ab..245f556 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/service/ExampleServiceTest.java +++ b/src/test/java/io/spring/jdbc/oracle/service/ExampleServiceTest.java @@ -1,11 +1,11 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.service; +package io.spring.jdbc.oracle.service; import static org.assertj.core.api.Assertions.assertThat; -import io.ngocnhan_tran1996.spring.jdbc.oracle.Customer; -import io.ngocnhan_tran1996.spring.jdbc.oracle.CustomerRecord; -import io.ngocnhan_tran1996.spring.jdbc.oracle.SetupTestData; -import io.ngocnhan_tran1996.spring.jdbc.oracle.config.ExampleConfig; +import io.spring.jdbc.oracle.Customer; +import io.spring.jdbc.oracle.CustomerRecord; +import io.spring.jdbc.oracle.SetupTestData; +import io.spring.jdbc.oracle.config.ExampleConfig; import java.math.BigDecimal; import java.util.HashMap; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/MatchersTest.java b/src/test/java/io/spring/jdbc/oracle/utils/MatchersTest.java similarity index 70% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/MatchersTest.java rename to src/test/java/io/spring/jdbc/oracle/utils/MatchersTest.java index 7742cf9..53f7288 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/MatchersTest.java +++ b/src/test/java/io/spring/jdbc/oracle/utils/MatchersTest.java @@ -1,9 +1,9 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.utils; +package io.spring.jdbc.oracle.utils; -import static io.ngocnhan_tran1996.spring.jdbc.oracle.utils.Matchers.not; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; import org.junit.jupiter.api.Test; @@ -14,13 +14,13 @@ class MatchersTest { @Test void when_input_is_true() { - assertFalse(not(true)); + Assertions.assertFalse(Matchers.not(true)); } @Test void when_input_is_false() { - assertTrue(not(false)); + Assertions.assertTrue(Matchers.not(false)); } } \ No newline at end of file diff --git a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/StringsTest.java b/src/test/java/io/spring/jdbc/oracle/utils/StringsTest.java similarity index 96% rename from src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/StringsTest.java rename to src/test/java/io/spring/jdbc/oracle/utils/StringsTest.java index 10666b0..d31ae6d 100644 --- a/src/test/java/io/ngocnhan_tran1996/spring/jdbc/oracle/utils/StringsTest.java +++ b/src/test/java/io/spring/jdbc/oracle/utils/StringsTest.java @@ -1,4 +1,4 @@ -package io.ngocnhan_tran1996.spring.jdbc.oracle.utils; +package io.spring.jdbc.oracle.utils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse;