Skip to content

Commit

Permalink
act: separate module
Browse files Browse the repository at this point in the history
  • Loading branch information
ngocnhan-tran1996 committed Jul 27, 2024
1 parent 905562b commit 856e4bc
Show file tree
Hide file tree
Showing 44 changed files with 86 additions and 69 deletions.
2 changes: 0 additions & 2 deletions .mvn/maven.config

This file was deleted.

61 changes: 7 additions & 54 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,15 @@

<groupId>io.github.ngocnhan-tran1996</groupId>
<artifactId>spring-jdbc-oracle</artifactId>
<version>${revision}{changelist}</version>
<name>Spring Jdbc Oracle</name>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<spring-jdbc.version>6.1.11</spring-jdbc.version>
<oracle.jdbc.version>23.4.0.24.05</oracle.jdbc.version>
</properties>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring-jdbc.version}</version>
<scope>provided</scope>
</dependency>
<name>Spring Jdbc Oracle</name>

<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle.jdbc.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<modules>
<module>spring-jdbc-oracle-core</module>
<module>spring-jdbc-oracle-test</module>
</modules>

<distributionManagement>
<site>
Expand All @@ -41,33 +23,4 @@
</site>
</distributionManagement>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
</plugins>
</build>
</project>
41 changes: 41 additions & 0 deletions spring-jdbc-oracle-core/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>

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

<artifactId>spring-jdbc-oracle-core</artifactId>

<properties>
<maven.compiler.source>22</maven.compiler.source>
<maven.compiler.target>22</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<spring-jdbc.version>6.1.11</spring-jdbc.version>
<oracle.jdbc.version>23.4.0.24.05</oracle.jdbc.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring-jdbc.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle.jdbc.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
6 changes: 3 additions & 3 deletions spring-jdbc-oracle-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.3.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<groupId>io.github.ngocnhan-tran1996</groupId>
<artifactId>spring-jdbc-oracle-test</artifactId>
<version>${revision}{changelist}</version>
<version>1.0.0-SNAPSHOT</version>

<properties>
<java.version>22</java.version>
Expand All @@ -22,7 +22,7 @@
<dependencies>
<dependency>
<groupId>io.github.ngocnhan-tran1996</groupId>
<artifactId>spring-jdbc-oracle</artifactId>
<artifactId>spring-jdbc-oracle-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

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.support.DefaultOracleConverters;
import io.spring.jdbc.oracle.exception.ValueException;
Expand All @@ -17,7 +18,6 @@
import java.util.Map;
import java.util.Optional;
import javax.sql.DataSource;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand Down Expand Up @@ -123,6 +123,16 @@ public LocalDate convert(LocalDateTime source) {

}

public record StringToTString() implements OracleConverter<String, String> {

@Override
public String convert(String source) {

return source;
}

}

record Person(
String firstName,
String lastName,
Expand Down Expand Up @@ -209,9 +219,7 @@ void convert() {
Map.of(
"first_name", "hello@world",
"lastname", "info",
"AGE", BigDecimal.TEN,
"biRthDate",
Timestamp.valueOf(LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
"AGE", BigDecimal.TEN
)
);
assertThat(output)
Expand All @@ -221,21 +229,34 @@ void convert() {
"hello@world",
"info",
BigDecimal.TEN,
Timestamp.valueOf(LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
null
)
);
}

@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
static class Person {

@OracleParameter(
input = @OracleType(converter = StringToTString.class),
output = @OracleType(converter = StringToTString.class)
)
private String firstName;
private String lastName;
private BigDecimal age;
private Timestamp birthDate;
private String unknown;

public Person(String firstName, String lastName, BigDecimal age, Timestamp birthDate) {

this.firstName = firstName;
this.lastName = lastName;
this.age = age;
this.birthDate = birthDate;
}

}

}
Expand Down Expand Up @@ -375,6 +396,7 @@ void mock_throw_exception_if_class_has_no_same_type() throws SQLException {

// arrange
var mapper = DelegateMapper.newInstance(PersonWrongBirthDatePojo.class);
mapper.setConverters(null);

// assert
var output = mapper.toStruct(
Expand All @@ -390,17 +412,20 @@ void mock_throw_exception_if_class_has_no_same_type() throws SQLException {
@Setter
static class PersonSetterPojo {

private String firstName;
String firstName;

@OracleParameter("firstName")
private String lastName;
String lastName;

}

@Getter
static class PersonGetterPojo {

private String firstName;
private final String firstName = "X";

@OracleParameter("firstName")
private String lastName;
private final String lastName = "X";
}

@Getter
Expand Down

0 comments on commit 856e4bc

Please sign in to comment.