Skip to content

Upgrade Vert.x to 4.5.1 + minor fixes #1822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 15, 2023
Merged

Upgrade Vert.x to 4.5.1 + minor fixes #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e218e72
[#1820] Upgrade Vert.x to 4.5.1
DavideD Dec 15, 2023
709268f
[#1821] Upgrade Hibernate Reactive to 2.2.0.Final for JBang
DavideD Dec 15, 2023
60c383e
[#1819] Add tests for mapping of array of primitives fields
DavideD Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ Hibernate Reactive has been tested with:
- MS SQL Server 2019
- Oracle 21.3
- [Hibernate ORM][] 6.4.0.Final
- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.0
- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.0
- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.0
- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.0
- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.0
- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.1
- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.1
- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.1
- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.1
- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.1
- [Quarkus][Quarkus] via the Hibernate Reactive extension

[PostgreSQL]: https://www.postgresql.org
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ ext {
// Example:
// ./gradlew build -PvertxSqlClientVersion=4.0.0-SNAPSHOT
if ( !project.hasProperty( 'vertxSqlClientVersion' ) ) {
vertxSqlClientVersion = '4.5.0'
vertxSqlClientVersion = '4.5.1'
}

testcontainersVersion = '1.18.3'
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ org.gradle.java.installations.auto-download=false
#skipOrmVersionParsing = true

# Override default Vert.x Sql client version
#vertxSqlClientVersion = 4.5.0-SNAPSHOT
#vertxSqlClientVersion = 4.5.1-SNAPSHOT

# Override default Vert.x Web client and server versions. For integration tests, both default to vertxSqlClientVersion
#vertxWebVersion = 4.5.0
#vertxWebtClientVersion = 4.5.0
#vertxWebVersion = 4.5.1
#vertxWebtClientVersion = 4.5.1

77 changes: 69 additions & 8 deletions hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/JavaTypesArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import org.hibernate.reactive.BaseReactiveTest;


import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIf;

Expand All @@ -41,7 +40,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;

@Timeout(value = 10, timeUnit = MINUTES)
@DisabledIf( "isNotSupported" )
@DisabledIf("isNotSupported")
public class JavaTypesArrayTest extends BaseReactiveTest {

@Override
Expand Down Expand Up @@ -80,48 +79,93 @@ public void testStringArrayType(VertxTestContext context) {
@Test
public void testBooleanArrayType(VertxTestContext context) {
Basic basic = new Basic();
Boolean[] dataArray = {TRUE, FALSE, TRUE};
Boolean[] dataArray = {TRUE, FALSE, null, TRUE};
basic.booleanArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.booleanArray ) );
}

@Test
public void testPrimitiveBooleanArrayType(VertxTestContext context) {
Basic basic = new Basic();
boolean[] dataArray = {true, false, true};
basic.primitiveBooleanArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.primitiveBooleanArray ) );
}

@Test
public void testIntegerArrayType(VertxTestContext context) {
Basic basic = new Basic();
Integer[] dataArray = {1, 2, 3};
Integer[] dataArray = {null, Integer.MIN_VALUE, 2, Integer.MAX_VALUE};
basic.integerArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.integerArray ) );
}

@Test
public void testPrimitiveIntegerArrayType(VertxTestContext context) {
Basic basic = new Basic();
int[] dataArray = {1, 2, 3};
basic.primitiveIntegerArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.primitiveIntegerArray ) );
}

@Test
public void testLongArrayType(VertxTestContext context) {
Basic basic = new Basic();
Long[] dataArray = {Long.MIN_VALUE, Long.MAX_VALUE, 3L};
Long[] dataArray = {Long.MIN_VALUE, Long.MAX_VALUE, 3L, null};
basic.longArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.longArray ) );
}

@Test
public void testPrimitiveLongArrayType(VertxTestContext context) {
Basic basic = new Basic();
long[] dataArray = {Long.MIN_VALUE, Long.MAX_VALUE, 3L};
basic.primitiveLongArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.primitiveLongArray ) );
}

@Test
public void testFloatArrayType(VertxTestContext context) {
Basic basic = new Basic();
Float[] dataArray = {12.562f, 13.562f};
Float[] dataArray = {12.562f, null, 13.562f};
basic.floatArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.floatArray ) );
}

@Test
public void testPrimitiveFloatArrayType(VertxTestContext context) {
Basic basic = new Basic();
float[] dataArray = {12.562f, 13.562f};
basic.primitiveFloatArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.primitiveFloatArray ) );
}

@Test
public void testDoubleArrayType(VertxTestContext context) {
Basic basic = new Basic();
Double[] dataArray = {12.562d, 13.562d};
Double[] dataArray = {12.562d, null, 13.562d};
basic.doubleArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.doubleArray ) );
}

@Test
public void testPrimitiveDoubleArrayType(VertxTestContext context) {
Basic basic = new Basic();
double[] dataArray = {12.562d, 13.562d};
basic.primitiveDoubleArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.primitiveDoubleArray ) );
}

@Test
public void testUUIDArrayType(VertxTestContext context) {
Basic basic = new Basic();
Expand Down Expand Up @@ -153,6 +197,15 @@ public void testShortArrayType(VertxTestContext context) {
testField( context, basic, found -> assertArrayEquals( dataArray, found.shortArray ) );
}

@Test
public void testPrimitiveShortArrayType(VertxTestContext context) {
Basic basic = new Basic();
short[] dataArray = {500, 32, -1};
basic.primitiveShortArray = dataArray;

testField( context, basic, found -> assertArrayEquals( dataArray, found.primitiveShortArray ) );
}

@Test
public void testLocalDateArrayType(VertxTestContext context) {
Basic basic = new Basic();
Expand Down Expand Up @@ -238,18 +291,26 @@ private static class Basic {
Integer id;
String[] stringArray;
Boolean[] booleanArray;

boolean[] primitiveBooleanArray;
Integer[] integerArray;
int[] primitiveIntegerArray;
Long[] longArray;
long[] primitiveLongArray;
Float[] floatArray;
float[] primitiveFloatArray;
Double[] doubleArray;
double[] primitiveDoubleArray;
UUID[] uuidArray;
AnEnum[] enumArray;
Short[] shortArray;
short[] primitiveShortArray;
Date[] dateArray;
LocalDate[] localDateArray;
LocalTime[] localTimeArray;
LocalDateTime[] localDateTimeArray;

// We have to specify the length for BigDecimal and BigInteger because
// the default column type when creating the schema is too small on some databases
@Column(length = 5000)
BigInteger[] bigIntegerArray;
@Column(length = 5000)
Expand Down
6 changes: 3 additions & 3 deletions tooling/jbang/CockroachDBReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.5.Final}
//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.1}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
//DEPS org.testcontainers:cockroachdb:1.18.3
Expand Down
6 changes: 3 additions & 3 deletions tooling/jbang/Db2ReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.5.Final}
//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.5.1}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
//DEPS org.testcontainers:db2:1.18.3
Expand Down
8 changes: 4 additions & 4 deletions tooling/jbang/Example.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*/

//DEPS com.ongres.scram:client:2.1
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.0}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.0.5.Final}
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.1}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.1}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.1}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.2.0.Final}
//DEPS org.slf4j:slf4j-simple:2.0.7
//DESCRIPTION Allow authentication to PostgreSQL using SCRAM:

Expand Down
6 changes: 3 additions & 3 deletions tooling/jbang/MariaDBReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.5.Final}
//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.1}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
//DEPS org.testcontainers:mariadb:1.18.3
Expand Down
6 changes: 3 additions & 3 deletions tooling/jbang/MySQLReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.5.Final}
//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.1}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
//DEPS org.testcontainers:mysql:1.18.3
Expand Down
6 changes: 3 additions & 3 deletions tooling/jbang/PostgreSQLReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.5.Final}
//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.1}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
//DEPS org.testcontainers:postgresql:1.18.3
Expand Down
10 changes: 5 additions & 5 deletions tooling/jbang/ReactiveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
*/

///usr/bin/env jbang "$0" "$@" ; exit $?
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.1}
//DEPS com.ongres.scram:client:2.1
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-unit:${vertx.version:4.5.0}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.0.5.Final}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.1}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.1}
//DEPS io.vertx:vertx-unit:${vertx.version:4.5.1}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.2.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
//DEPS org.testcontainers:postgresql:1.18.3
Expand Down