Skip to content

Commit

Permalink
act: change package name
Browse files Browse the repository at this point in the history
  • Loading branch information
ngocnhan-tran1996 committed Jul 22, 2024
1 parent eb87294 commit c84265b
Show file tree
Hide file tree
Showing 55 changed files with 179 additions and 193 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.ngocnhan_tran1996</groupId>
<groupId>io.github.ngocnhan-tran1996</groupId>
<artifactId>spring-jdbc-oracle</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>21</maven.compiler.source>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.ngocnhan_tran1996.spring.jdbc.oracle.accessor;
package io.spring.jdbc.oracle.accessor;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
@@ -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<T> {

Expand All @@ -14,7 +12,7 @@ protected ParameterAccessor(String parameterName, Class<T> mappedClass) {

if (Strings.isBlank(parameterName)) {

throw new ValueException(NOT_NULL.formatted("parameter"));
throw new ValueException(Strings.NOT_NULL.formatted("parameter"));
}

this.parameterName = parameterName.toUpperCase();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.ngocnhan_tran1996.spring.jdbc.oracle.converter;
package io.spring.jdbc.oracle.converter;

import org.springframework.core.convert.TypeDescriptor;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.ngocnhan_tran1996.spring.jdbc.oracle.converter;
package io.spring.jdbc.oracle.converter;

@FunctionalInterface
public interface OracleConverter<S, D> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.ngocnhan_tran1996.spring.jdbc.oracle.converter;
package io.spring.jdbc.oracle.converter;

import org.springframework.core.convert.TypeDescriptor;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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(
Expand All @@ -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);
Expand Down Expand Up @@ -150,7 +149,7 @@ private ConvertKey getConvertKey(Class<?> converterClass, Class<?> genericClass)
private List<Class<?>> getClassHierarchy(Class<?> type) {

List<Class<?>> hierarchy = new ArrayList<>(20);
Set<Class<?>> visited = new HashSet<>(20);
Set<Class<?>> visited = HashSet.newHashSet(20);
this.addToClassHierarchy(
0,
ClassUtils.resolvePrimitiveIfNecessary(type),
Expand Down
Original file line number Diff line number Diff line change
@@ -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<Object, Object> {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.ngocnhan_tran1996.spring.jdbc.oracle.exception;
package io.spring.jdbc.oracle.exception;

public class ValueException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -125,7 +124,7 @@ protected <T> Object[] toStruct(

this.readProperties.forEach((columnName, typeProperty) -> {

if (not(columnNameByIndex.containsKey(columnName))) {
if (Matchers.not(columnNameByIndex.containsKey(columnName))) {

return;
}
Expand Down Expand Up @@ -182,7 +181,7 @@ protected <T> T constructInstance(Connection connection, Map<String, Object> val

this.writeProperties.forEach((columnName, typeProperty) -> {

if (not(valueByName.containsKey(columnName))) {
if (Matchers.not(valueByName.containsKey(columnName))) {

return;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -18,7 +16,7 @@ class ArrayTypeValue<T> 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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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"));
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -26,7 +24,7 @@ class StructArrayTypeValue<T> extends ArrayTypeValue<T> {
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -19,12 +16,12 @@ class StructTypeValue<T> 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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit c84265b

Please sign in to comment.