From 724ae527b9ef6afc482f3a8684881e1baa869f67 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 6 Jan 2023 17:01:45 +0100 Subject: refactor(web/server): Migrate to Hypersistence Utils This change updates the web server to use the Hypersistence Utils library instead of our custom code to store columns as JSON in H2 and Postgres. --- gradle/libs.versions.toml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 627f1768..16f9f685 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ commons-math3 = "3.6.1" dokka = "1.7.10" gradle-node = "3.5.0" hadoop = "3.3.4" +hypersistence-utils = "3.0.1" jackson = "2.14.0" jandex-gradle = "1.0.0" java = "17" @@ -83,6 +84,7 @@ quarkus-hibernate-validator = { module = "io.quarkus:quarkus-hibernate-validator quarkus-jdbc-h2 = { module = "io.quarkus:quarkus-jdbc-h2" } quarkus-jdbc-postgresql = { module = "io.quarkus:quarkus-jdbc-postgresql" } quarkus-flyway = { module = "io.quarkus:quarkus-flyway" } +hypersistence-utils-hibernate = { module = "io.hypersistence:hypersistence-utils-hibernate-55", version.ref = "hypersistence-utils" } # Quarkus (Testing) quarkus-junit5-core = { module = "io.quarkus:quarkus-junit5" } -- cgit v1.2.3 From e64487cb57ca75d17fe5a8a664c1e8247c7b5168 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sat, 7 Jan 2023 19:23:11 +0000 Subject: refactor(web/server): Use Panache for entity modeling This change updates the OpenDC web server to use Panache (provided by Quarkus) to model entities. Such approach is better supported in Quarkus and simplifies our implementation. --- gradle/libs.versions.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 16f9f685..186c1388 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -79,7 +79,8 @@ quarkus-resteasy-jackson = { module = "io.quarkus:quarkus-resteasy-jackson" } quarkus-smallrye-openapi = { module = "io.quarkus:quarkus-smallrye-openapi" } quarkus-security = { module = "io.quarkus:quarkus-security" } quarkus-oidc = { module = "io.quarkus:quarkus-oidc" } -quarkus-hibernate-orm = { module = "io.quarkus:quarkus-hibernate-orm" } +quarkus-hibernate-orm-core = { module = "io.quarkus:quarkus-hibernate-orm" } +quarkus-hibernate-orm-panache = { module = "io.quarkus:quarkus-hibernate-orm-panache" } quarkus-hibernate-validator = { module = "io.quarkus:quarkus-hibernate-validator" } quarkus-jdbc-h2 = { module = "io.quarkus:quarkus-jdbc-h2" } quarkus-jdbc-postgresql = { module = "io.quarkus:quarkus-jdbc-postgresql" } @@ -90,6 +91,7 @@ hypersistence-utils-hibernate = { module = "io.hypersistence:hypersistence-utils quarkus-junit5-core = { module = "io.quarkus:quarkus-junit5" } quarkus-junit5-mockk = { module = "io.quarkiverse.mockk:quarkus-junit5-mockk", version.ref = "quarkus-junit5-mockk" } quarkus-jacoco = { module = "io.quarkus:quarkus-jacoco" } +quarkus-panache-mock = { module = "io.quarkus:quarkus-panache-mock" } quarkus-test-security = { module = "io.quarkus:quarkus-test-security" } restassured-core = { module = "io.rest-assured:rest-assured" } restassured-kotlin = { module = "io.rest-assured:kotlin-extensions" } -- cgit v1.2.3 From 6927c51885bb3073b310150c4f40c64eea44a919 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 22 Jan 2023 00:30:51 +0000 Subject: refactor(web/server): Convert resources to Java This change converts the resource classes of the OpenDC web server to use Java, The Quarkus integration for Java is more mature and the programming quality of experience is not that much worse. --- gradle/libs.versions.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 186c1388..2581f1ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,8 +23,7 @@ mockk = "1.13.2" node = "18.12.0" parquet = "1.12.3" progressbar = "0.9.3" -quarkus = "2.14.2.Final" -quarkus-junit5-mockk = "1.1.1" +quarkus = "2.16.1.Final" sentry = "6.8.0" slf4j = "2.0.4" spotless = "6.12.0" @@ -89,12 +88,10 @@ hypersistence-utils-hibernate = { module = "io.hypersistence:hypersistence-utils # Quarkus (Testing) quarkus-junit5-core = { module = "io.quarkus:quarkus-junit5" } -quarkus-junit5-mockk = { module = "io.quarkiverse.mockk:quarkus-junit5-mockk", version.ref = "quarkus-junit5-mockk" } quarkus-jacoco = { module = "io.quarkus:quarkus-jacoco" } quarkus-panache-mock = { module = "io.quarkus:quarkus-panache-mock" } quarkus-test-security = { module = "io.quarkus:quarkus-test-security" } restassured-core = { module = "io.rest-assured:rest-assured" } -restassured-kotlin = { module = "io.rest-assured:kotlin-extensions" } # Calcite (SQL) calcite-core = { module = "org.apache.calcite:calcite-core", version.ref = "calcite" } -- cgit v1.2.3