diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java
index 54f481ff16420e..e66fef8f2e7ef4 100644
--- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java
+++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java
@@ -26,6 +26,7 @@
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.AnnotationTarget.Kind;
import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.ClassInfo;
@@ -345,16 +346,22 @@ public void transform(TransformationContext ctx) {
AnnotationInstance clientAnnotation = Annotations.find(ctx.getQualifiers(), GrpcDotNames.GRPC_CLIENT);
if (clientAnnotation != null && clientAnnotation.value() == null) {
String clientName = null;
+ AnnotationTarget annotationTarget = ctx.getTarget();
if (ctx.getTarget().kind() == Kind.FIELD) {
clientName = clientAnnotation.target().asField().name();
- } else if (ctx.getTarget().kind() == Kind.METHOD_PARAMETER) {
+ } else if (ctx.getTarget().kind() == Kind.METHOD
+ && clientAnnotation.target().kind().equals(Kind.METHOD_PARAMETER)) {
MethodParameterInfo param = clientAnnotation.target().asMethodParameter();
+ annotationTarget = param;
// We don't need to check if parameter names are recorded - that's validated elsewhere
clientName = param.method().parameterName(param.position());
}
if (clientName != null) {
ctx.transform().remove(GrpcDotNames::isGrpcClient)
- .add(GrpcDotNames.GRPC_CLIENT, AnnotationValue.createStringValue("value", clientName)).done();
+ .add(AnnotationInstance.builder(GrpcDotNames.GRPC_CLIENT)
+ .value(clientName)
+ .buildWithTarget(annotationTarget))
+ .done();
}
}
}
diff --git a/extensions/grpc/deployment/src/main/resources/dev-ui/qwc-grpc-services.js b/extensions/grpc/deployment/src/main/resources/dev-ui/qwc-grpc-services.js
index 27eba4c5a3594e..7a505a4861051d 100644
--- a/extensions/grpc/deployment/src/main/resources/dev-ui/qwc-grpc-services.js
+++ b/extensions/grpc/deployment/src/main/resources/dev-ui/qwc-grpc-services.js
@@ -2,6 +2,9 @@ import { QwcHotReloadElement, html, css} from 'qwc-hot-reload-element';
import { JsonRpc } from 'jsonrpc';
import { columnBodyRenderer } from '@vaadin/grid/lit.js';
import { gridRowDetailsRenderer } from '@vaadin/grid/lit.js';
+import { observeState } from 'lit-element-state';
+import { themeState } from 'theme-state';
+import '@quarkus-webcomponents/codeblock';
import '@vaadin/progress-bar';
import '@vaadin/grid';
import '@vaadin/grid/vaadin-grid-sort-column.js';
@@ -9,14 +12,13 @@ import '@vaadin/vertical-layout';
import '@vaadin/tabs';
import '@vaadin/split-layout';
import 'qui-badge';
-import 'qui-code-block';
import 'qui-ide-link';
import '@vaadin/button';
/**
* This component shows the Grpc Services
*/
-export class QwcGrpcServices extends QwcHotReloadElement {
+export class QwcGrpcServices extends observeState(QwcHotReloadElement) {
jsonRpc = new JsonRpc(this);
streamsMap = new Map();
@@ -214,6 +216,7 @@ export class QwcGrpcServices extends QwcHotReloadElement {
mode='json'
content='${method.prototype}'
value='${method.prototype}'
+ theme='${themeState.theme.name}'
editable>
@@ -221,7 +224,8 @@ export class QwcGrpcServices extends QwcHotReloadElement {
+ content='\n\n\n\n'
+ theme='${themeState.theme.name}'>
`;
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/HelloWorldTlsEndpointTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/HelloWorldTlsEndpointTest.java
index d465032c4857c9..ec0acc2e3e07bb 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/HelloWorldTlsEndpointTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/HelloWorldTlsEndpointTest.java
@@ -10,7 +10,11 @@
import io.quarkus.grpc.client.tls.HelloWorldTlsEndpoint;
import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+@Certificates(baseDir = "target/certs", certificates = @Certificate(name = "grpc-client-tls", formats = Format.PEM))
class HelloWorldTlsEndpointTest {
@RegisterExtension
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithJKSTrustStoreWithHttpServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithJKSTrustStoreWithHttpServerTest.java
new file mode 100644
index 00000000000000..0aa557be56e167
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithJKSTrustStoreWithHttpServerTest.java
@@ -0,0 +1,60 @@
+package io.quarkus.grpc.client.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class MtlsWithJKSTrustStoreWithHttpServerTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-jks.path=target/certs/grpc-client-truststore.jks
+ quarkus.grpc.clients.hello.tls.trust-certificate-jks.password=password
+ quarkus.grpc.clients.hello.tls.key-certificate-jks.path=target/certs/grpc-client-keystore.jks
+ quarkus.grpc.clients.hello.tls.key-certificate-jks.password=password
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.use-separate-server=false
+ quarkus.grpc.server.plain-text=false # Force the client to use TLS for the tests
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.jks
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.ssl.certificate.trust-store-file=target/certs/grpc-server-truststore.jks
+ quarkus.http.ssl.certificate.trust-store-password=password
+ quarkus.http.ssl.client-auth=REQUIRED
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @GrpcClient("hello")
+ GreeterGrpc.GreeterBlockingStub blockingHelloService;
+
+ @Test
+ void testClientTlsConfiguration() {
+ HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithP12TrustStoreWithHttpServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithP12TrustStoreWithHttpServerTest.java
new file mode 100644
index 00000000000000..458e93ccc47ddb
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithP12TrustStoreWithHttpServerTest.java
@@ -0,0 +1,60 @@
+package io.quarkus.grpc.client.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class MtlsWithP12TrustStoreWithHttpServerTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-p12.path=target/certs/grpc-client-truststore.p12
+ quarkus.grpc.clients.hello.tls.trust-certificate-p12.password=password
+ quarkus.grpc.clients.hello.tls.key-certificate-p12.path=target/certs/grpc-client-keystore.p12
+ quarkus.grpc.clients.hello.tls.key-certificate-p12.password=password
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.use-separate-server=false
+ quarkus.grpc.server.plain-text=false # Force the client to use TLS for the tests
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.jks
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.ssl.certificate.trust-store-file=target/certs/grpc-server-truststore.jks
+ quarkus.http.ssl.certificate.trust-store-password=password
+ quarkus.http.ssl.client-auth=REQUIRED
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @GrpcClient("hello")
+ GreeterGrpc.GreeterBlockingStub blockingHelloService;
+
+ @Test
+ void testClientTlsConfiguration() {
+ HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithPemTrustStoreWithHttpServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithPemTrustStoreWithHttpServerTest.java
new file mode 100644
index 00000000000000..e8a42172f0fffe
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/MtlsWithPemTrustStoreWithHttpServerTest.java
@@ -0,0 +1,59 @@
+package io.quarkus.grpc.client.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class MtlsWithPemTrustStoreWithHttpServerTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-pem.certs=target/certs/grpc-client-ca.crt
+ quarkus.grpc.clients.hello.tls.key-certificate-pem.certs=target/certs/grpc-client.crt
+ quarkus.grpc.clients.hello.tls.key-certificate-pem.keys=target/certs/grpc-client.key
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.use-separate-server=false
+ quarkus.grpc.server.plain-text=false # Force the client to use TLS for the tests
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.jks
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.ssl.certificate.trust-store-file=target/certs/grpc-server-truststore.jks
+ quarkus.http.ssl.certificate.trust-store-password=password
+ quarkus.http.ssl.client-auth=REQUIRED
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @GrpcClient("hello")
+ GreeterGrpc.GreeterBlockingStub blockingHelloService;
+
+ @Test
+ void testClientTlsConfiguration() {
+ HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithJKSTrustStoreTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithJKSTrustStoreTest.java
new file mode 100644
index 00000000000000..00adb5bbe3bc8e
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithJKSTrustStoreTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.grpc.client.tls;
+
+import static io.restassured.RestAssured.get;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class TlsWithJKSTrustStoreTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.host=localhost
+ quarkus.grpc.clients.hello.port=9001
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-jks.path=target/certs/grpc-client-truststore.jks
+ quarkus.grpc.clients.hello.tls.trust-certificate-jks.password=password
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.ssl.certificate=target/certs/grpc.crt
+ quarkus.grpc.server.ssl.key=target/certs/grpc.key
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(io.grpc.examples.helloworld.GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @Test
+ void testClientTlsConfiguration() {
+ String response = get("/hello/blocking/neo").asString();
+ assertThat(response).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithJKSTrustStoreWithHttpServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithJKSTrustStoreWithHttpServerTest.java
new file mode 100644
index 00000000000000..851349cf67dc23
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithJKSTrustStoreWithHttpServerTest.java
@@ -0,0 +1,55 @@
+package io.quarkus.grpc.client.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class TlsWithJKSTrustStoreWithHttpServerTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-jks.path=target/certs/grpc-client-truststore.jks
+ quarkus.grpc.clients.hello.tls.trust-certificate-jks.password=password
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.use-separate-server=false
+ quarkus.grpc.server.plain-text=false # Force the client to use TLS for the tests
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.jks
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(io.grpc.examples.helloworld.GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @GrpcClient("hello")
+ GreeterGrpc.GreeterBlockingStub blockingHelloService;
+
+ @Test
+ void testClientTlsConfiguration() {
+ HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithP12TrustStoreTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithP12TrustStoreTest.java
new file mode 100644
index 00000000000000..c456376c9e9384
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithP12TrustStoreTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.grpc.client.tls;
+
+import static io.restassured.RestAssured.get;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class TlsWithP12TrustStoreTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.host=localhost
+ quarkus.grpc.clients.hello.port=9001
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-p12.path=target/certs/grpc-client-truststore.p12
+ quarkus.grpc.clients.hello.tls.trust-certificate-p12.password=password
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.ssl.certificate=target/certs/grpc.crt
+ quarkus.grpc.server.ssl.key=target/certs/grpc.key
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(io.grpc.examples.helloworld.GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @Test
+ void testClientTlsConfiguration() {
+ String response = get("/hello/blocking/neo").asString();
+ assertThat(response).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithP12TrustStoreWithHttpServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithP12TrustStoreWithHttpServerTest.java
new file mode 100644
index 00000000000000..380c04b729d266
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithP12TrustStoreWithHttpServerTest.java
@@ -0,0 +1,55 @@
+package io.quarkus.grpc.client.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class TlsWithP12TrustStoreWithHttpServerTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-p12.path=target/certs/grpc-client-truststore.p12
+ quarkus.grpc.clients.hello.tls.trust-certificate-p12.password=password
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.use-separate-server=false
+ quarkus.grpc.server.plain-text=false # Force the client to use TLS for the tests
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.jks
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @GrpcClient("hello")
+ GreeterGrpc.GreeterBlockingStub blockingHelloService;
+
+ @Test
+ void testClientTlsConfiguration() {
+ HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithPemTrustStoreTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithPemTrustStoreTest.java
new file mode 100644
index 00000000000000..64a6a2682daf1a
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithPemTrustStoreTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.grpc.client.tls;
+
+import static io.restassured.RestAssured.get;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class TlsWithPemTrustStoreTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.host=localhost
+ quarkus.grpc.clients.hello.port=9001
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-pem.certs=target/certs/grpc-client-ca.crt
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.ssl.certificate=target/certs/grpc.crt
+ quarkus.grpc.server.ssl.key=target/certs/grpc.key
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(io.grpc.examples.helloworld.GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @Test
+ void testClientTlsConfiguration() {
+ String response = get("/hello/blocking/neo").asString();
+ assertThat(response).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithPemTrustStoreWithHttpServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithPemTrustStoreWithHttpServerTest.java
new file mode 100644
index 00000000000000..ace79d838275dd
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/TlsWithPemTrustStoreWithHttpServerTest.java
@@ -0,0 +1,54 @@
+package io.quarkus.grpc.client.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+class TlsWithPemTrustStoreWithHttpServerTest {
+
+ private static final String configuration = """
+ quarkus.grpc.clients.hello.plain-text=false
+ quarkus.grpc.clients.hello.tls.trust-certificate-pem.certs=target/certs/grpc-client-ca.crt
+ quarkus.grpc.clients.hello.tls.enabled=true
+ quarkus.grpc.clients.hello.use-quarkus-grpc-client=true
+
+ quarkus.grpc.server.use-separate-server=false
+ quarkus.grpc.server.plain-text=false # Force the client to use TLS for the tests
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.jks
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+ .addPackage(GreeterGrpc.class.getPackage())
+ .add(new StringAsset(configuration), "application.properties"));
+
+ @GrpcClient("hello")
+ GreeterGrpc.GreeterBlockingStub blockingHelloService;
+
+ @Test
+ void testClientTlsConfiguration() {
+ HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java
index edcf342c1f61ca..5b66f4da9fe3d0 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java
@@ -1,5 +1,6 @@
package io.quarkus.grpc.server;
+import java.io.File;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -31,11 +32,16 @@
import io.quarkus.grpc.server.services.MutinyHelloService;
import io.quarkus.grpc.server.services.MutinyTestService;
import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
/**
* Test services exposed by the gRPC server implemented using the regular gRPC model.
* Communication uses TLS.
*/
+@Certificates(baseDir = "target/certs", certificates = @Certificate(name = "grpc-tls", password = "wibble", formats = {
+ Format.JKS, Format.PEM, Format.PKCS12 }))
public class MutinyGrpcServiceWithSSLTest extends GrpcServiceTestBase {
@RegisterExtension
@@ -54,7 +60,7 @@ public class MutinyGrpcServiceWithSSLTest extends GrpcServiceTestBase {
@BeforeEach
public void init() throws Exception {
SslContext sslcontext = GrpcSslContexts.forClient()
- .trustManager(createTrustAllTrustManager())
+ .trustManager(new File("target/certs/grpc-tls-ca.crt"))
.build();
channel = NettyChannelBuilder.forAddress("localhost", 9001)
.sslContext(sslcontext)
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java
index 33c0f848933630..6509bcf88dd44c 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java
@@ -30,11 +30,16 @@
import io.quarkus.grpc.server.services.HelloService;
import io.quarkus.grpc.server.services.TestService;
import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
/**
* Test services exposed by the gRPC server implemented using the regular gRPC model.
* Communication uses TLS and the key is loaded from the classpath.
*/
+@Certificates(baseDir = "target/certs", certificates = @Certificate(name = "grpc-tls", password = "wibble", formats = {
+ Format.JKS, Format.PEM, Format.PKCS12 }))
public class RegularGrpcServiceWithSSLFromClasspathTest extends GrpcServiceTestBase {
@RegisterExtension
@@ -46,14 +51,14 @@ public class RegularGrpcServiceWithSSLFromClasspathTest extends GrpcServiceTestB
HelloRequestOrBuilder.class, HelloReplyOrBuilder.class,
EmptyProtos.class, Messages.class, MutinyTestServiceGrpc.class,
TestServiceGrpc.class)
- .addAsResource(new File("src/test/resources/tls/server-keystore.jks"), "server-keystore.jks"))
+ .addAsResource(new File("target/certs/grpc-tls-keystore.jks"), "server-keystore.jks"))
.withConfigurationResource("grpc-server-tls-classpath-configuration.properties");
@Override
@BeforeEach
public void init() throws Exception {
SslContext sslcontext = GrpcSslContexts.forClient()
- .trustManager(createTrustAllTrustManager())
+ .trustManager(new File("target/certs/grpc-tls-ca.crt"))
.build();
channel = NettyChannelBuilder.forAddress("localhost", 9001)
.sslContext(sslcontext)
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java
index 835b0dd868d703..3b22054f041b3b 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java
@@ -1,5 +1,6 @@
package io.quarkus.grpc.server;
+import java.io.File;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -29,11 +30,16 @@
import io.quarkus.grpc.server.services.HelloService;
import io.quarkus.grpc.server.services.TestService;
import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
/**
* Test services exposed by the gRPC server implemented using the regular gRPC model.
* Communication uses TLS.
*/
+@Certificates(baseDir = "target/certs", certificates = @Certificate(name = "grpc-tls", password = "wibble", formats = {
+ Format.JKS, Format.PEM, Format.PKCS12 }))
public class RegularGrpcServiceWithSSLTest extends GrpcServiceTestBase {
@RegisterExtension
@@ -52,7 +58,7 @@ public class RegularGrpcServiceWithSSLTest extends GrpcServiceTestBase {
@BeforeEach
public void init() throws Exception {
SslContext sslcontext = GrpcSslContexts.forClient()
- .trustManager(createTrustAllTrustManager())
+ .trustManager(new File("target/certs/grpc-tls-ca.crt"))
.build();
channel = NettyChannelBuilder.forAddress("localhost", 9001)
.sslContext(sslcontext)
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingJKSTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingJKSTest.java
new file mode 100644
index 00000000000000..36fed74b5500e7
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingJKSTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.grpc.server.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.ManagedChannel;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.HelloService;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+public class TlsWithHttpServerUsingJKSTest {
+
+ static String configuration = """
+ quarkus.grpc.server.use-separate-server=false
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.jks
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(GreeterGrpc.class.getPackage())
+ .addClass(HelloService.class)
+ .add(new StringAsset(configuration), "application.properties"));
+
+ protected ManagedChannel channel;
+
+ @BeforeEach
+ public void init() throws Exception {
+ File certs = new File("target/certs/grpc-client-ca.crt");
+ SslContext sslcontext = GrpcSslContexts.forClient()
+ .trustManager(certs)
+ .build();
+ channel = NettyChannelBuilder.forAddress("localhost", 8444)
+ .sslContext(sslcontext)
+ .useTransportSecurity()
+ .build();
+ }
+
+ @AfterEach
+ public void shutdown() {
+ if (channel != null) {
+ channel.shutdownNow();
+ }
+ }
+
+ @Test
+ public void testInvokingGrpcServiceUsingTls() {
+ HelloReply reply = GreeterGrpc.newBlockingStub(channel)
+ .sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingP12Test.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingP12Test.java
new file mode 100644
index 00000000000000..57ee009e332be9
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingP12Test.java
@@ -0,0 +1,76 @@
+package io.quarkus.grpc.server.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.ManagedChannel;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.HelloService;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+public class TlsWithHttpServerUsingP12Test {
+
+ static String configuration = """
+ quarkus.grpc.server.use-separate-server=false
+
+ quarkus.http.ssl.certificate.key-store-file=target/certs/grpc-keystore.p12
+ quarkus.http.ssl.certificate.key-store-password=password
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(GreeterGrpc.class.getPackage())
+ .addClass(HelloService.class)
+ .add(new StringAsset(configuration), "application.properties"));
+
+ protected ManagedChannel channel;
+
+ @BeforeEach
+ public void init() throws Exception {
+ File certs = new File("target/certs/grpc-client-ca.crt");
+ SslContext sslcontext = GrpcSslContexts.forClient()
+ .trustManager(certs)
+ .build();
+ channel = NettyChannelBuilder.forAddress("localhost", 8444)
+ .sslContext(sslcontext)
+ .useTransportSecurity()
+ .build();
+ }
+
+ @AfterEach
+ public void shutdown() {
+ if (channel != null) {
+ channel.shutdownNow();
+ }
+ }
+
+ @Test
+ public void testInvokingGrpcServiceUsingTls() {
+ HelloReply reply = GreeterGrpc.newBlockingStub(channel)
+ .sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingPemTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingPemTest.java
new file mode 100644
index 00000000000000..0b1b19cad66dbe
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithHttpServerUsingPemTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.grpc.server.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.ManagedChannel;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.HelloService;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+public class TlsWithHttpServerUsingPemTest {
+
+ static String configuration = """
+ quarkus.grpc.server.use-separate-server=false
+
+ quarkus.http.ssl.certificate.files=target/certs/grpc.crt
+ quarkus.http.ssl.certificate.key-files=target/certs/grpc.key
+ quarkus.http.insecure-requests=disabled
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(GreeterGrpc.class.getPackage())
+ .addClass(HelloService.class)
+ .add(new StringAsset(configuration), "application.properties"));
+
+ protected ManagedChannel channel;
+
+ @BeforeEach
+ public void init() throws Exception {
+ File certs = new File("target/certs/grpc-client-ca.crt");
+ SslContext sslcontext = GrpcSslContexts.forClient()
+ .trustManager(certs)
+ .build();
+ channel = NettyChannelBuilder.forAddress("localhost", 8444)
+ .sslContext(sslcontext)
+ .useTransportSecurity()
+ .build();
+ }
+
+ @AfterEach
+ public void shutdown() {
+ if (channel != null) {
+ channel.shutdownNow();
+ }
+ }
+
+ @Test
+ public void testInvokingGrpcServiceUsingTls() {
+ HelloReply reply = GreeterGrpc.newBlockingStub(channel)
+ .sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithJksKeyStoreTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithJksKeyStoreTest.java
new file mode 100644
index 00000000000000..17097fff7bed92
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithJksKeyStoreTest.java
@@ -0,0 +1,74 @@
+package io.quarkus.grpc.server.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.*;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.HelloService;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+public class TlsWithJksKeyStoreTest {
+
+ static String configuration = """
+ quarkus.grpc.server.ssl.key-store=target/certs/grpc-keystore.jks
+ quarkus.grpc.server.ssl.key-store-password=password
+ quarkus.grpc.server.alpn=true
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(GreeterGrpc.class.getPackage())
+ .addClass(HelloService.class)
+ .add(new StringAsset(configuration), "application.properties"));
+
+ protected ManagedChannel channel;
+
+ @BeforeEach
+ public void init() throws Exception {
+ File certs = new File("target/certs/grpc-client-ca.crt");
+ SslContext sslcontext = GrpcSslContexts.forClient()
+ .trustManager(certs)
+ .build();
+ channel = NettyChannelBuilder.forAddress("localhost", 9001)
+ .sslContext(sslcontext)
+ .useTransportSecurity()
+ .build();
+ }
+
+ @AfterEach
+ public void shutdown() {
+ if (channel != null) {
+ channel.shutdownNow();
+ }
+ }
+
+ @Test
+ public void testInvokingGrpcServiceUsingTls() {
+ HelloReply reply = GreeterGrpc.newBlockingStub(channel)
+ .sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithP12KeyStoreTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithP12KeyStoreTest.java
new file mode 100644
index 00000000000000..4a566a941c04a2
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithP12KeyStoreTest.java
@@ -0,0 +1,74 @@
+package io.quarkus.grpc.server.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.ManagedChannel;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.HelloService;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+public class TlsWithP12KeyStoreTest {
+
+ static String configuration = """
+ quarkus.grpc.server.ssl.key-store=target/certs/grpc-keystore.p12
+ quarkus.grpc.server.ssl.key-store-password=password
+ quarkus.grpc.server.alpn=true
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(GreeterGrpc.class.getPackage())
+ .addClass(HelloService.class)
+ .add(new StringAsset(configuration), "application.properties"));
+
+ protected ManagedChannel channel;
+
+ @BeforeEach
+ public void init() throws Exception {
+ File certs = new File("target/certs/grpc-client-ca.crt");
+ SslContext sslcontext = GrpcSslContexts.forClient()
+ .trustManager(certs)
+ .build();
+ channel = NettyChannelBuilder.forAddress("localhost", 9001)
+ .sslContext(sslcontext)
+ .useTransportSecurity()
+ .build();
+ }
+
+ @AfterEach
+ public void shutdown() {
+ if (channel != null) {
+ channel.shutdownNow();
+ }
+ }
+
+ @Test
+ public void testInvokingGrpcServiceUsingTls() {
+ HelloReply reply = GreeterGrpc.newBlockingStub(channel)
+ .sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithPemKeyStoreTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithPemKeyStoreTest.java
new file mode 100644
index 00000000000000..dc19a4b22a1463
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/tls/TlsWithPemKeyStoreTest.java
@@ -0,0 +1,74 @@
+package io.quarkus.grpc.server.tls;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.ManagedChannel;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.HelloService;
+import io.quarkus.test.QuarkusUnitTest;
+import me.escoffier.certs.Format;
+import me.escoffier.certs.junit5.Certificate;
+import me.escoffier.certs.junit5.Certificates;
+
+@Certificates(baseDir = "target/certs", certificates = {
+ @Certificate(name = "grpc", password = "password", formats = { Format.JKS, Format.PEM, Format.PKCS12 }, client = true)
+})
+public class TlsWithPemKeyStoreTest {
+
+ static String configuration = """
+ quarkus.grpc.server.ssl.certificate=target/certs/grpc.crt
+ quarkus.grpc.server.ssl.key=target/certs/grpc.key
+ quarkus.grpc.server.alpn=true
+ """;
+
+ @RegisterExtension
+ static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+ () -> ShrinkWrap.create(JavaArchive.class)
+ .addPackage(GreeterGrpc.class.getPackage())
+ .addClass(HelloService.class)
+ .add(new StringAsset(configuration), "application.properties"));
+
+ protected ManagedChannel channel;
+
+ @BeforeEach
+ public void init() throws Exception {
+ File certs = new File("target/certs/grpc-client-ca.crt");
+ SslContext sslcontext = GrpcSslContexts.forClient()
+ .trustManager(certs)
+ .build();
+ channel = NettyChannelBuilder.forAddress("localhost", 9001)
+ .sslContext(sslcontext)
+ .useTransportSecurity()
+ .build();
+ }
+
+ @AfterEach
+ public void shutdown() {
+ if (channel != null) {
+ channel.shutdownNow();
+ }
+ }
+
+ @Test
+ public void testInvokingGrpcServiceUsingTls() {
+ HelloReply reply = GreeterGrpc.newBlockingStub(channel)
+ .sayHello(HelloRequest.newBuilder().setName("neo").build());
+ assertThat(reply.getMessage()).isEqualTo("Hello neo");
+ }
+
+}
diff --git a/extensions/grpc/deployment/src/test/resources/grpc-client-tls-configuration.properties b/extensions/grpc/deployment/src/test/resources/grpc-client-tls-configuration.properties
index c393ab7d3fd1ef..ba7bb700876412 100644
--- a/extensions/grpc/deployment/src/test/resources/grpc-client-tls-configuration.properties
+++ b/extensions/grpc/deployment/src/test/resources/grpc-client-tls-configuration.properties
@@ -1,6 +1,6 @@
quarkus.grpc.clients.hello.host=localhost
quarkus.grpc.clients.hello.port=9001
-quarkus.grpc.clients.hello.ssl.trust-store=src/test/resources/tls-from-file/ca.pem
+quarkus.grpc.clients.hello.ssl.trust-store=target/certs/grpc-client-tls-ca.crt
-quarkus.grpc.server.ssl.certificate=src/test/resources/tls-from-file/server.pem
-quarkus.grpc.server.ssl.key=src/test/resources/tls-from-file/server.key
\ No newline at end of file
+quarkus.grpc.server.ssl.certificate=target/certs/grpc-client-tls.crt
+quarkus.grpc.server.ssl.key=target/certs/grpc-client-tls.key
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/grpc-server-tls-configuration.properties b/extensions/grpc/deployment/src/test/resources/grpc-server-tls-configuration.properties
index b7d56ade9f0152..57700bf9e33c83 100644
--- a/extensions/grpc/deployment/src/test/resources/grpc-server-tls-configuration.properties
+++ b/extensions/grpc/deployment/src/test/resources/grpc-server-tls-configuration.properties
@@ -1,3 +1,3 @@
-quarkus.grpc.server.ssl.key-store=src/test/resources/tls/server-keystore.jks
+quarkus.grpc.server.ssl.key-store=target/certs/grpc-tls-keystore.jks
quarkus.grpc.server.ssl.key-store-password=wibble
quarkus.grpc.server.alpn=true
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/README.md b/extensions/grpc/deployment/src/test/resources/tls-from-file/README.md
deleted file mode 100644
index 8c1886e98b5e4d..00000000000000
--- a/extensions/grpc/deployment/src/test/resources/tls-from-file/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Generating the certificates and keys
-
-The ca is self-signed:
-----------------------
-
-```bash
-openssl req -x509 -new -newkey rsa:2048 -nodes -keyout ca.key -out ca.pem \
- -config ca-openssl.cnf -days 3650 -extensions v3_req
-```
-
-When prompted for certificate information, everything is default.
-
-Client is issued by CA:
------------------------
-
-```bash
-openssl genrsa -out client.key.rsa 2048
-openssl pkcs8 -topk8 -in client.key.rsa -out client.key -nocrypt
-openssl req -new -key client.key -out client.csr
-```
-
-When prompted for certificate information, everything is default except the
-common name which is set to `testclient`.
-
-```bash
-openssl x509 -req -CA ca.pem -CAkey ca.key -CAcreateserial -in client.csr \
- -out client.pem -days 3650
-```
-
-server is issued by CA with a special config for subject alternative names:
-----------------------------------------------------------------------------
-
-```bash
-openssl genrsa -out server1.key.rsa 2048
-openssl pkcs8 -topk8 -in server.key.rsa -out server.key -nocrypt
-openssl req -new -key server.key -out server.csr -config server-openssl.cnf
-```
-
-When prompted for certificate information, everything is default except the
-common name which is set to `localhost`.
-
-```bash
-openssl x509 -req -CA ca.pem -CAkey ca.key -CAcreateserial -in server.csr \
- -out server.pem -extfile server-openssl.cnf -days 3650
-```
-
-Cleanup
--------
-
-```bash
-rm *.rsa
-rm *.csr
-rm ca.srl
-```
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/ca-openssl.cnf b/extensions/grpc/deployment/src/test/resources/tls-from-file/ca-openssl.cnf
deleted file mode 100644
index 7a8528ec2304a1..00000000000000
--- a/extensions/grpc/deployment/src/test/resources/tls-from-file/ca-openssl.cnf
+++ /dev/null
@@ -1,17 +0,0 @@
-[req]
-distinguished_name = req_distinguished_name
-req_extensions = v3_req
-
-[req_distinguished_name]
-countryName = Country Name (2 letter code)
-countryName_default = FR
-stateOrProvinceName = State or Province Name (full name)
-stateOrProvinceName_default = Some-State
-organizationName = Organization Name (eg, company)
-organizationName_default = Acme Corp
-commonName = Common Name (eg, YOUR name)
-commonName_default = testca
-
-[v3_req]
-basicConstraints = CA:true
-keyUsage = critical, keyCertSign
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/ca.pem b/extensions/grpc/deployment/src/test/resources/tls-from-file/ca.pem
deleted file mode 100644
index b3c622bc96b47c..00000000000000
--- a/extensions/grpc/deployment/src/test/resources/tls-from-file/ca.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDMTCCAhmgAwIBAgIJAKH9BBbnY/fjMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlBY21lIENvcnAx
-DzANBgNVBAMMBnRlc3RjYTAeFw0yMDA0MDQwNzI5NTdaFw0zMDA0MDIwNzI5NTda
-MEcxCzAJBgNVBAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlB
-Y21lIENvcnAxDzANBgNVBAMMBnRlc3RjYTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJqJz93r5o5q+yr2zX97CZaW+6pqVhdf8x73x+/E+9fIML96pvUJ
-VQJSMVV+dOHqb860inw9WE7itckTlArB5vpVfjGunbCGOxNTgaUBMJeaalXgFUkL
-36mFpGhwXVaUVKdrCSbol3R/eKAc6qcN4g/plKgSnGtODjxd1za64OhZn3Cz8tUN
-yxmnGlFkOU7S3F8YF2aTmIjZZcs7JF93VmLyVzDkWzlySmKqXXt1xpzFADCMzHjR
-GuUaOilC9dstvfZHNhQv2TIBYHwltShYV/86J+p5RXlRkaHxfnqKgPenw82SehWs
-2eGkgLFnUp1Q9nTwIB4l7NmEyJzzTg0xMj8CAwEAAaMgMB4wDAYDVR0TBAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAAxVmtqKlPaXOIDv
-ZHaLLt0TdhukEqf13nMPSb6sxA0eOD3GNR3CUBMfftVRkEVjvqZRbYjJTnG9IW8E
-39tESrLPnoWEYdvDJBM4sTsG2JLVpaq6mNcMQABkAIjnbjq0yXK+WwP6Ug5HD7Ds
-r8hbiu5T039v0uHxJOM/+nhkyyHMsAYaAnUKQ9F0fbo8Jp/d5KK70k5hMpb2smr1
-cYVkN9AZlBgOeciFfO1RrWGsnTo3Aln6wciSXPqqj42t8WZJp1s11Lqcml1zJqHe
-dQkI9NjPZ67V0D0mytvIixchClMCl9E9AkXjGdapE1lQ3s6TK5t0COpo0VE4KAvd
-cXRzvCI=
------END CERTIFICATE-----
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/server-openssl.cnf b/extensions/grpc/deployment/src/test/resources/tls-from-file/server-openssl.cnf
deleted file mode 100644
index 3962a52d790d4b..00000000000000
--- a/extensions/grpc/deployment/src/test/resources/tls-from-file/server-openssl.cnf
+++ /dev/null
@@ -1,80 +0,0 @@
-[req]
-distinguished_name = req_distinguished_name
-req_extensions = v3_req
-
-[req_distinguished_name]
-countryName = Country Name (2 letter code)
-countryName_default = FR
-stateOrProvinceName = State or Province Name (full name)
-stateOrProvinceName_default = Some-State
-localityName = Locality Name (eg, city)
-localityName_default = Valence
-organizationName = Organization Name (eg, company)
-organizationName_default = Acme Corp
-commonName = Common Name (eg, YOUR name)
-commonName_max = 64
-
-####################################################################
-[ ca ]
-default_ca = CA_default # The default ca section
-
-####################################################################
-[ CA_default ]
-
-dir = . # Where everything is kept
-certs = $dir # Where the issued certs are kept
-crl_dir = $dir # Where the issued crl are kept
-database = $dir/index.txt # database index file.
-new_certs_dir = $dir # default place for new certs.
-
-certificate = $dir/ca.pem # The CA certificate
-serial = $dir/serial # The current serial number
-crlnumber = $dir/crlnumber # the current crl number
- # must be commented out to leave a V1 CRL
-crl = $dir/crl.pem # The current CRL
-private_key = $dir/private/cakey.pem# The private key
-RANDFILE = $dir/private/.rand # private random number file
-
-x509_extensions = usr_cert
-
-# Comment out the following two lines for the "traditional"
-# (and highly broken) format.
-name_opt = ca_default # Subject Name options
-cert_opt = ca_default # Certificate field options
-
-# Extension copying option: use with caution.
-# copy_extensions = copy
-
-# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
-# so this is commented out by default to leave a V1 CRL.
-# crlnumber must also be commented out to leave a V1 CRL.
-# crl_extensions = crl_ext
-
-default_days = 365 # how long to certify for
-default_crl_days= 30 # how long before next CRL
-default_md = default # use public key default MD
-preserve = no # keep passed DN ordering
-
-# A few difference way of specifying how similar the request should look
-# For type CA, the listed attributes must be the same, and the optional
-# and supplied fields are just that :-)
-policy = policy_anything
-[ policy_anything ]
-countryName = optional
-stateOrProvinceName = optional
-localityName = optional
-organizationName = optional
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
-
-[v3_req]
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-subjectAltName = @alt_names
-
-[alt_names]
-DNS.1 = localhost
-DNS.2 = *.test.com
-IP.1 = "127.0.0.1"
-IP.2 = "192.168.1.3"
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/server.key b/extensions/grpc/deployment/src/test/resources/tls-from-file/server.key
deleted file mode 100644
index b49d98c926e61c..00000000000000
--- a/extensions/grpc/deployment/src/test/resources/tls-from-file/server.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCy40A8Keuwa6aK
-NRxqa5nbrNpQnWF1hd9kO848UzUI06X9GLve459Q4KCNUDgUA1PL6zUaVbFpmLrp
-6iBimxr1u+HqVyYkha4veLXKA1+nLcp0gUOQTb4Dk6jHdGhgwIaPo8saFO9sY2Vy
-+xh8MU8cepjZtxgt9cI/+RGQgg0uEz7NT3tjlX3b7Y7SQChv2fsA6ZuE/3v2XBLg
-zCgNEfdYh46B0pkE3Od3xq+cieOOuFHCeHFX+wZcCJWHa7tLxsgKIp+QohqG4MoF
-KWCf7484nu8EYd7YzNdzPN6XmcQuw2IUr2YjDFaY0EZ6ERTkSRoMBbvjq9bGPYix
-kPHwQnOFAgMBAAECggEBAJP7yJy8tRvpwgidLRegUdRXZva/aus0xvt9OfvPfZUC
-uVLpzijxtk7KtCaS0QFFS2Hq/q/9admIHj/5jbbkxuW3+ojIdWZLLDBbNE+cgNmk
-2NGOSZ0rouAEm9/8HYjEW8yh3BeEcBgDFd6Ld9LtW5uck6uvepIytvIDEhOwckTF
-BtrtJubHIAjeTFfdikcNuQbQHwWDWu8ykRG7gXyEGXJjWXV+lRZqY+JtBm8TpF2H
-6pj1DwPcBt0yt7LoXrrfIlMabqdWXgmfu+j5kvxyZNWOg56G48hfFIg3e8dri/7/
-xHI8t3dnN/L67VbHMor3xMYmeGQQnq9Zkv5tcj+c40ECgYEA2Q5svQA66l6ubpJo
-sSKfBIskIe/WuzWB0YmV0jdg0mqivG/bxObK0sZr6Jcd4T3v5J3PMit0G3gOfhPO
-sD6otk/Lo9d7whOfskjG3kDODrx+mRVHhVfamUcqzk722OrDGh9NeCHaCbPBAhMd
-tmugi+SF1eSUPtfAwqW9o0qP7NUCgYEA0vu1gOxFZPbIdThNIGyzudn1+FSpEc67
-kiB/FJnculpPf9fRaL//dMG+sItUwFvSTJ+xYf+mRcSXl6imY7zSTgakjAp+mzMZ
-LPZeMY9qZxEgIIiLcX/WVi6Ldveukh9Mbzd6v+dfqZJEBiA5EDfyjdVl6APRmybv
-3VR/rHoGA/ECgYEA12TMHWY8ENXyTUG26IkNukmFirPhqBd6AwCAj4Jq74PoiAyM
-z0Gj5jQHY2GKwjlfdMPxl7ytVJD3+L8ZLaaQb5KR573vTvGAWUCFMIqosND25FzM
-g5NiFxcbcG3F4g5dm++SRfN51oTttGxZ4Ou+/vPAqDhTsGUUIVSt8nwMhR0CgYAM
-iTQxothEtX0Xqe67PHo5UsAQr0cUbcorVo72dGXvFKqgl/wzUyUklNZ1uvGgNFR8
-hQiPIBeLEbFIK5cnWfLM/AwO3hjDs/eM+l6CZ1kVIqlcBYDzj3r2x/E1cmYG/KEY
-Ap3ihSbj9nLgQk3hrtFUqBdT/9YWd+vMpNapMt7koQKBgBNzxUtQOKcT3EaJytfe
-LqVayA6mfhjZisUtw1ufg9iPUDyGo8Wj3h5QI0aY9240Bztp/f/qWRF0vCcA6mNm
-U4edOI1EjWqvgkLw0Nav3xSNO4jDchA/A9Lj2y6mjGmmaj5E17vowRz1s3GHDtIX
-lpwir++lc7qUgPNttzfK/ltI
------END PRIVATE KEY-----
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/server.pem b/extensions/grpc/deployment/src/test/resources/tls-from-file/server.pem
deleted file mode 100644
index 0564aead544636..00000000000000
--- a/extensions/grpc/deployment/src/test/resources/tls-from-file/server.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDJDCCAgygAwIBAgIJAKhxPs8iIgiBMA0GCSqGSIb3DQEBBQUAMEcxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlBY21lIENvcnAx
-DzANBgNVBAMMBnRlc3RjYTAeFw0yMDA0MDQwODEzMjhaFw0zMDA0MDIwODEzMjha
-MFwxCzAJBgNVBAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRAwDgYDVQQHDAdW
-YWxlbmNlMRIwEAYDVQQKDAlBY21lIENvcnAxEjAQBgNVBAMMCWxvY2FsaG9zdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLjQDwp67Brpoo1HGprmdus
-2lCdYXWF32Q7zjxTNQjTpf0Yu97jn1DgoI1QOBQDU8vrNRpVsWmYuunqIGKbGvW7
-4epXJiSFri94tcoDX6ctynSBQ5BNvgOTqMd0aGDAho+jyxoU72xjZXL7GHwxTxx6
-mNm3GC31wj/5EZCCDS4TPs1Pe2OVfdvtjtJAKG/Z+wDpm4T/e/ZcEuDMKA0R91iH
-joHSmQTc53fGr5yJ4464UcJ4cVf7BlwIlYdru0vGyAoin5CiGobgygUpYJ/vjzie
-7wRh3tjM13M83peZxC7DYhSvZiMMVpjQRnoRFORJGgwFu+Or1sY9iLGQ8fBCc4UC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAFEYYp3wV1xH9+Z44GJSjTa9Ltg5gxqmf
-t7ROsiy01vPuWQDhLILRpGQHdyz07AOmYsaGRTMOCcOsUCDY7u0NYi991HBEn1ZI
-/+2tFNZnLTk/hLtNSW30MWt0sNE2d6DIMZQBAtvrWnFdrQAThzTQLeFpbi+nTX+O
-KwtVpci8gMej90fEnyYRdNn/yTmjo79Q4+yuD9oKhvsOxy65CmSvXh9oLpqH7HzQ
-TR6LfuWSpG6wGKy1JW5fXuwb0YJC1QjvAOVWr9zm79wyeXUuXfQ6A2SNHTPwwEbu
-K+kV+UX7NofWhepi1QOxKnnO3EXbdN7fl44jEuzaGOKtmfhiRse4cQ==
------END CERTIFICATE-----
diff --git a/extensions/grpc/deployment/src/test/resources/tls/client-truststore.jks b/extensions/grpc/deployment/src/test/resources/tls/client-truststore.jks
deleted file mode 100644
index fbb345f0cd3bb9..00000000000000
Binary files a/extensions/grpc/deployment/src/test/resources/tls/client-truststore.jks and /dev/null differ
diff --git a/extensions/grpc/deployment/src/test/resources/tls/server-keystore.jks b/extensions/grpc/deployment/src/test/resources/tls/server-keystore.jks
deleted file mode 100644
index 8e68758e08cbce..00000000000000
Binary files a/extensions/grpc/deployment/src/test/resources/tls/server-keystore.jks and /dev/null differ
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java
index f11186d3a30a65..2f95cf0248e87d 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java
@@ -186,7 +186,7 @@ private void buildGrpcServer(Vertx vertx, GrpcServerConfiguration configuration,
initHealthStorage();
- LOGGER.info("Starting new Vert.x gRPC server ...");
+ LOGGER.info("Starting new Quarkus gRPC server (using Vert.x transport)...");
Route route = routerSupplier.getValue().route().handler(ctx -> {
if (!isGrpc(ctx)) {
ctx.next();
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcClientConfiguration.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcClientConfiguration.java
index 16f1a0540f4090..80a9092fcb07b9 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcClientConfiguration.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcClientConfiguration.java
@@ -60,9 +60,16 @@ public class GrpcClientConfiguration {
/**
* The SSL/TLS config.
+ * Only use this if you want to use the old Java gRPC client.
*/
public SslClientConfig ssl;
+ /**
+ * The TLS config.
+ * Only use this if you want to use the Quarkus gRPC client.
+ */
+ public TlsClientConfig tls;
+
/**
* Use a name resolver. Defaults to dns.
* If set to "stork", host will be treated as SmallRye Stork service name
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/TlsClientConfig.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/TlsClientConfig.java
new file mode 100644
index 00000000000000..a48f9786b6c214
--- /dev/null
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/TlsClientConfig.java
@@ -0,0 +1,132 @@
+package io.quarkus.grpc.runtime.config;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class TlsClientConfig {
+
+ /**
+ * Whether SSL/TLS is enabled.
+ */
+ @ConfigItem(defaultValue = "false")
+ public boolean enabled;
+
+ /**
+ * Enable trusting all certificates. Disabled by default.
+ */
+ @ConfigItem(defaultValue = "false")
+ public boolean trustAll;
+
+ /**
+ * Trust configuration in the PEM format.
+ *
+ * When used, {@code trust-certificate-jks} and {@code trust-certificate-p12} must not be used.
+ */
+ public PemTrustCertConfiguration trustCertificatePem;
+
+ /**
+ * Trust configuration in the JKS format.
+ *
+ * When configured, {@code trust-certificate-pem} and {@code trust-certificate-p12} must not be used.
+ */
+ public JksConfiguration trustCertificateJks;
+
+ /**
+ * Trust configuration in the P12 format.
+ *
+ * When configured, {@code trust-certificate-jks} and {@code trust-certificate-pem} must not be used.
+ */
+ public PfxConfiguration trustCertificateP12;
+
+ /**
+ * Key/cert configuration in the PEM format.
+ *
+ * When configured, {@code key-certificate-jks} and {@code key-certificate-p12} must not be used.
+ */
+ public PemKeyCertConfiguration keyCertificatePem;
+
+ /**
+ * Key/cert configuration in the JKS format.
+ *
+ * When configured, {@code #key-certificate-pem} and {@code #key-certificate-p12} must not be used.
+ */
+ public JksConfiguration keyCertificateJks;
+
+ /**
+ * Key/cert configuration in the P12 format.
+ *
+ * When configured, {@code key-certificate-jks} and {@code #key-certificate-pem} must not be used.
+ */
+ public PfxConfiguration keyCertificateP12;
+
+ /**
+ * Whether hostname should be verified in the SSL/TLS handshake.
+ */
+ @ConfigItem(defaultValue = "true")
+ public boolean verifyHostname;
+
+ @ConfigGroup
+ public static class PemTrustCertConfiguration {
+
+ /**
+ * Comma-separated list of the trust certificate files (Pem format).
+ */
+ @ConfigItem
+ public Optional> certs;
+
+ }
+
+ @ConfigGroup
+ public static class JksConfiguration {
+
+ /**
+ * Path of the key file (JKS format).
+ */
+ @ConfigItem
+ public Optional path;
+
+ /**
+ * Password of the key file.
+ */
+ @ConfigItem
+ public Optional password;
+ }
+
+ @ConfigGroup
+ public static class PfxConfiguration {
+
+ /**
+ * Path to the key file (PFX format).
+ */
+ @ConfigItem
+ public Optional path;
+
+ /**
+ * Password of the key.
+ */
+ @ConfigItem
+ public Optional password;
+ }
+
+ @ConfigGroup
+ public static class PemKeyCertConfiguration {
+
+ /**
+ * Comma-separated list of the path to the key files (Pem format).
+ */
+ @ConfigItem
+ public Optional> keys;
+
+ /**
+ * Comma-separated list of the path to the certificate files (Pem format).
+ */
+ @ConfigItem
+ public Optional> certs;
+
+ }
+
+}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java
index 65831169c0b036..aafa71bdbb8807 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java
@@ -5,6 +5,12 @@
import static io.grpc.netty.NettyChannelBuilder.DEFAULT_FLOW_CONTROL_WINDOW;
import static io.quarkus.grpc.runtime.GrpcTestPortUtils.testPort;
import static io.quarkus.grpc.runtime.config.GrpcClientConfiguration.DNS;
+import static io.quarkus.grpc.runtime.supports.SSLConfigHelper.configureJksKeyCertOptions;
+import static io.quarkus.grpc.runtime.supports.SSLConfigHelper.configureJksTrustOptions;
+import static io.quarkus.grpc.runtime.supports.SSLConfigHelper.configurePemKeyCertOptions;
+import static io.quarkus.grpc.runtime.supports.SSLConfigHelper.configurePemTrustOptions;
+import static io.quarkus.grpc.runtime.supports.SSLConfigHelper.configurePfxKeyCertOptions;
+import static io.quarkus.grpc.runtime.supports.SSLConfigHelper.configurePfxTrustOptions;
import java.io.IOException;
import java.io.InputStream;
@@ -54,6 +60,7 @@
import io.quarkus.grpc.runtime.config.GrpcClientConfiguration;
import io.quarkus.grpc.runtime.config.GrpcServerConfiguration;
import io.quarkus.grpc.runtime.config.SslClientConfig;
+import io.quarkus.grpc.runtime.config.TlsClientConfig;
import io.quarkus.grpc.runtime.stork.StorkGrpcChannel;
import io.quarkus.grpc.runtime.stork.StorkMeasuringGrpcInterceptor;
import io.quarkus.grpc.runtime.stork.VertxStorkMeasuringGrpcInterceptor;
@@ -250,7 +257,8 @@ public static Channel createChannel(String name, Set perClientIntercepto
return builder.build();
} else {
- HttpClientOptions options = new HttpClientOptions(); // TODO options
+ // Vert.x client
+ HttpClientOptions options = new HttpClientOptions();
options.setHttp2ClearTextUpgrade(false); // this fixes i30379
if (!plainText) {
@@ -258,20 +266,34 @@ public static Channel createChannel(String name, Set perClientIntercepto
options.setSsl(true);
options.setUseAlpn(true);
- if (config.ssl.trustStore.isPresent()) {
- Optional trustStorePath = config.ssl.trustStore;
- if (trustStorePath.isPresent()) {
- PemTrustOptions to = new PemTrustOptions();
- to.addCertValue(bufferFor(trustStorePath.get(), "trust store"));
- options.setTrustOptions(to);
- }
- Optional certificatePath = config.ssl.certificate;
- Optional keyPath = config.ssl.key;
- if (certificatePath.isPresent() && keyPath.isPresent()) {
- PemKeyCertOptions cko = new PemKeyCertOptions();
- cko.setCertValue(bufferFor(certificatePath.get(), "certificate"));
- cko.setKeyValue(bufferFor(keyPath.get(), "key"));
- options.setKeyCertOptions(cko);
+ TlsClientConfig tls = config.tls;
+ if (tls.enabled) {
+ options.setSsl(true).setTrustAll(tls.trustAll);
+
+ configurePemTrustOptions(options, tls.trustCertificatePem);
+ configureJksTrustOptions(options, tls.trustCertificateJks);
+ configurePfxTrustOptions(options, tls.trustCertificateP12);
+
+ configurePemKeyCertOptions(options, tls.keyCertificatePem);
+ configureJksKeyCertOptions(options, tls.keyCertificateJks);
+ configurePfxKeyCertOptions(options, tls.keyCertificateP12);
+ options.setVerifyHost(tls.verifyHostname);
+ } else {
+ if (config.ssl.trustStore.isPresent()) {
+ Optional trustStorePath = config.ssl.trustStore;
+ if (trustStorePath.isPresent()) {
+ PemTrustOptions to = new PemTrustOptions();
+ to.addCertValue(bufferFor(trustStorePath.get(), "trust store"));
+ options.setTrustOptions(to);
+ }
+ Optional certificatePath = config.ssl.certificate;
+ Optional keyPath = config.ssl.key;
+ if (certificatePath.isPresent() && keyPath.isPresent()) {
+ PemKeyCertOptions cko = new PemKeyCertOptions();
+ cko.setCertValue(bufferFor(certificatePath.get(), "certificate"));
+ cko.setKeyValue(bufferFor(keyPath.get(), "key"));
+ options.setKeyCertOptions(cko);
+ }
}
}
}
@@ -309,7 +331,7 @@ public static Channel createChannel(String name, Set perClientIntercepto
interceptors.addAll(interceptorContainer.getSortedPerServiceInterceptors(perClientInterceptors));
interceptors.addAll(interceptorContainer.getSortedGlobalInterceptors());
- LOGGER.info("Creating Vert.x gRPC channel ...");
+ LOGGER.debug("Creating Vert.x gRPC channel ...");
return new InternalGrpcChannel(client, channel, ClientInterceptors.intercept(channel, interceptors));
}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/SSLConfigHelper.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/SSLConfigHelper.java
new file mode 100644
index 00000000000000..c8e1f7e6cdbd74
--- /dev/null
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/SSLConfigHelper.java
@@ -0,0 +1,120 @@
+package io.quarkus.grpc.runtime.supports;
+
+import io.quarkus.grpc.runtime.config.TlsClientConfig;
+import io.vertx.core.net.JksOptions;
+import io.vertx.core.net.KeyCertOptions;
+import io.vertx.core.net.PemKeyCertOptions;
+import io.vertx.core.net.PemTrustOptions;
+import io.vertx.core.net.PfxOptions;
+import io.vertx.core.net.TCPSSLOptions;
+
+public class SSLConfigHelper {
+
+ public static void configurePemTrustOptions(TCPSSLOptions options,
+ TlsClientConfig.PemTrustCertConfiguration configuration) {
+ if ((configuration.certs.isPresent() && !configuration.certs.get().isEmpty())) {
+ ensureTrustOptionsNotSet(options);
+ options.setTrustOptions(toPemTrustOptions(configuration));
+ }
+ }
+
+ private static PemTrustOptions toPemTrustOptions(TlsClientConfig.PemTrustCertConfiguration configuration) {
+ PemTrustOptions pemTrustOptions = new PemTrustOptions();
+ if (configuration.certs.isPresent()) {
+ for (String cert : configuration.certs.get()) {
+ pemTrustOptions.addCertPath(cert);
+ }
+ }
+ return pemTrustOptions;
+ }
+
+ public static void configureJksTrustOptions(TCPSSLOptions options, TlsClientConfig.JksConfiguration configuration) {
+ if (configuration.path.isPresent()) {
+ ensureTrustOptionsNotSet(options);
+ options.setTrustOptions(toJksOptions(configuration));
+ }
+ }
+
+ private static JksOptions toJksOptions(TlsClientConfig.JksConfiguration configuration) {
+ JksOptions jksOptions = new JksOptions();
+ if (configuration.path.isPresent()) {
+ jksOptions.setPath(configuration.path.get());
+ }
+ if (configuration.password.isPresent()) {
+ jksOptions.setPassword(configuration.password.get());
+ }
+ return jksOptions;
+ }
+
+ public static void configurePfxTrustOptions(TCPSSLOptions options, TlsClientConfig.PfxConfiguration configuration) {
+ if (configuration.path.isPresent()) {
+ ensureTrustOptionsNotSet(options);
+ options.setTrustOptions(toPfxOptions(configuration));
+ }
+ }
+
+ private static PfxOptions toPfxOptions(TlsClientConfig.PfxConfiguration configuration) {
+ PfxOptions pfxOptions = new PfxOptions();
+ if (configuration.path.isPresent()) {
+ pfxOptions.setPath(configuration.path.get());
+ }
+ if (configuration.password.isPresent()) {
+ pfxOptions.setPassword(configuration.password.get());
+ }
+ return pfxOptions;
+ }
+
+ private static void ensureTrustOptionsNotSet(TCPSSLOptions options) {
+ if (options.getTrustOptions() != null) {
+ throw new IllegalArgumentException("Trust options have already been set");
+ }
+ }
+
+ public static void configurePemKeyCertOptions(TCPSSLOptions options,
+ TlsClientConfig.PemKeyCertConfiguration configuration) {
+ if (configuration.certs.isPresent() && !configuration.certs.get().isEmpty() && configuration.keys.isPresent()
+ && !configuration.keys.get().isEmpty()) {
+ ensureKeyCertOptionsNotSet(options);
+ options.setKeyCertOptions(toPemKeyCertOptions(configuration));
+ }
+ }
+
+ private static KeyCertOptions toPemKeyCertOptions(TlsClientConfig.PemKeyCertConfiguration configuration) {
+ PemKeyCertOptions pemKeyCertOptions = new PemKeyCertOptions();
+ if (configuration.certs.isPresent()) {
+ for (String cert : configuration.certs.get()) {
+ pemKeyCertOptions.addCertPath(cert);
+ }
+ }
+ if (configuration.keys.isPresent()) {
+ for (String cert : configuration.keys.get()) {
+ pemKeyCertOptions.addKeyPath(cert);
+ }
+ }
+ return pemKeyCertOptions;
+ }
+
+ public static void configureJksKeyCertOptions(TCPSSLOptions options, TlsClientConfig.JksConfiguration configuration) {
+ if (configuration.path.isPresent()) {
+ ensureKeyCertOptionsNotSet(options);
+ options.setKeyCertOptions(toJksOptions(configuration));
+ }
+ }
+
+ public static void configurePfxKeyCertOptions(TCPSSLOptions options, TlsClientConfig.PfxConfiguration configuration) {
+ if (configuration.path.isPresent()) {
+ ensureKeyCertOptionsNotSet(options);
+ options.setKeyCertOptions(toPfxOptions(configuration));
+ }
+ }
+
+ private static void ensureKeyCertOptionsNotSet(TCPSSLOptions options) {
+ if (options.getKeyCertOptions() != null) {
+ throw new IllegalArgumentException("Key cert options have already been set");
+ }
+ }
+
+ private SSLConfigHelper() {
+ // Utility
+ }
+}
\ No newline at end of file
diff --git a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversDisabledProcessor.java b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversDisabledProcessor.java
index b2894c347c577f..6a9f0c05165418 100644
--- a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversDisabledProcessor.java
+++ b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversDisabledProcessor.java
@@ -37,9 +37,9 @@ public void disableHibernateEnversStaticInit(HibernateEnversRecorder recorder,
// TODO move this to runtime init once we implement in Hibernate ORM a way
// to remove entity types from the metamodel on runtime init
public void checkNoExplicitActiveTrue(HibernateEnversBuildTimeConfig buildTimeConfig) {
- for (var entry : buildTimeConfig.getAllPersistenceUnitConfigsAsMap().entrySet()) {
+ for (var entry : buildTimeConfig.persistenceUnits().entrySet()) {
var config = entry.getValue();
- if (config.active.isPresent() && config.active.get()) {
+ if (config.active().isPresent() && config.active().get()) {
var puName = entry.getKey();
String enabledPropertyKey = HibernateEnversBuildTimeConfig.extensionPropertyKey("enabled");
String activePropertyKey = HibernateEnversBuildTimeConfig.persistenceUnitPropertyKey(puName, "active");
diff --git a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversEnabled.java b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversEnabled.java
index 5451c0d2828e3c..035673f2b66eb2 100644
--- a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversEnabled.java
+++ b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversEnabled.java
@@ -18,7 +18,7 @@ public class HibernateEnversEnabled implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
- return config.enabled;
+ return config.enabled();
}
}
diff --git a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java
index a3b4d43cd46a43..d4f135cbee5c73 100644
--- a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java
+++ b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java
@@ -40,10 +40,10 @@ public void registerEnversReflections(BuildProducer re
.produce(ReflectiveClassBuildItem.builder("org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity")
.methods().build());
- for (HibernateEnversBuildTimeConfigPersistenceUnit pu : buildTimeConfig.getAllPersistenceUnitConfigsAsMap().values()) {
- pu.revisionListener.ifPresent(
+ for (HibernateEnversBuildTimeConfigPersistenceUnit pu : buildTimeConfig.persistenceUnits().values()) {
+ pu.revisionListener().ifPresent(
s -> reflectiveClass.produce(ReflectiveClassBuildItem.builder(s).methods().fields().build()));
- pu.auditStrategy.ifPresent(
+ pu.auditStrategy().ifPresent(
s -> reflectiveClass.produce(ReflectiveClassBuildItem.builder(s).methods().fields().build()));
}
}
diff --git a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfig.java b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfig.java
index 5c48492b5508e2..e88e1c94d6758b 100644
--- a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfig.java
+++ b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfig.java
@@ -1,17 +1,19 @@
package io.quarkus.hibernate.envers;
import java.util.Map;
-import java.util.TreeMap;
import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigPhase;
import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
+import io.smallrye.config.WithParentName;
+import io.smallrye.config.WithUnnamedKey;
+@ConfigMapping(prefix = "quarkus.hibernate-envers")
@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
-public class HibernateEnversBuildTimeConfig {
+public interface HibernateEnversBuildTimeConfig {
/**
* Whether Hibernate Envers is enabled during the build.
*
@@ -23,37 +25,22 @@ public class HibernateEnversBuildTimeConfig {
*
* @asciidoclet
*/
- @ConfigItem(defaultValue = "true")
- public boolean enabled;
+ @WithDefault("true")
+ boolean enabled();
/**
- * Configuration for the default persistence unit.
+ * Configuration for persistence units.
*/
- @ConfigItem(name = ConfigItem.PARENT)
- public HibernateEnversBuildTimeConfigPersistenceUnit defaultPersistenceUnit;
-
- /**
- * Configuration for additional named persistence units.
- */
- @ConfigDocSection
+ @WithParentName
+ @WithUnnamedKey(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME)
@ConfigDocMapKey("persistence-unit-name")
- @ConfigItem(name = ConfigItem.PARENT)
- public Map persistenceUnits;
-
- public Map getAllPersistenceUnitConfigsAsMap() {
- Map map = new TreeMap<>();
- if (defaultPersistenceUnit != null) {
- map.put(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, defaultPersistenceUnit);
- }
- map.putAll(persistenceUnits);
- return map;
- }
+ Map persistenceUnits();
- public static String extensionPropertyKey(String radical) {
+ static String extensionPropertyKey(String radical) {
return "quarkus.hibernate-envers." + radical;
}
- public static String persistenceUnitPropertyKey(String persistenceUnitName, String radical) {
+ static String persistenceUnitPropertyKey(String persistenceUnitName, String radical) {
StringBuilder keyBuilder = new StringBuilder("quarkus.hibernate-envers.");
if (!PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) {
keyBuilder.append("\"").append(persistenceUnitName).append("\".");
diff --git a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfigPersistenceUnit.java b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfigPersistenceUnit.java
index 8645657bd5037c..bdf85ee85615f2 100644
--- a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfigPersistenceUnit.java
+++ b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfigPersistenceUnit.java
@@ -2,11 +2,12 @@
import java.util.Optional;
+import io.quarkus.runtime.annotations.ConfigDocDefault;
import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
+import io.smallrye.config.WithDefault;
@ConfigGroup
-public class HibernateEnversBuildTimeConfigPersistenceUnit {
+public interface HibernateEnversBuildTimeConfigPersistenceUnit {
/**
* Whether Hibernate Envers should be active for this persistence unit at runtime.
@@ -24,164 +25,163 @@ public class HibernateEnversBuildTimeConfigPersistenceUnit {
*
* @asciidoclet
*/
- @ConfigItem(defaultValueDocumentation = "'true' if Hibernate ORM is enabled; 'false' otherwise")
- public Optional active = Optional.empty();
+ @ConfigDocDefault("'true' if Hibernate ORM is enabled; 'false' otherwise")
+ Optional active();
/**
* Enable store_data_at_delete feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#STORE_DATA_AT_DELETE}.
*/
- @ConfigItem(defaultValue = "false")
- public boolean storeDataAtDelete;
+ @WithDefault("false")
+ boolean storeDataAtDelete();
/**
* Defines a suffix for historical data table. Defaults to {@literal _AUD}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#AUDIT_TABLE_SUFFIX}.
*/
- @ConfigItem(defaultValue = "_AUD")
- public Optional auditTableSuffix;
+ @WithDefault("_AUD")
+ Optional auditTableSuffix();
/**
* Defines a prefix for historical data table. Default is the empty string.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#AUDIT_TABLE_PREFIX}.
*/
- @ConfigItem(defaultValue = "")
- public Optional auditTablePrefix;
+ @WithDefault("")
+ Optional auditTablePrefix();
/**
* Revision field name. Defaults to {@literal REV}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#REVISION_FIELD_NAME}.
*/
- @ConfigItem(defaultValue = "REV")
- public Optional revisionFieldName;
+ @WithDefault("REV")
+ Optional revisionFieldName();
/**
* Revision type field name. Defaults to {@literal REVTYPE}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#REVISION_TYPE_FIELD_NAME}.
*/
- @ConfigItem(defaultValue = "REVTYPE")
- public Optional revisionTypeFieldName;
+ @WithDefault("REVTYPE")
+ Optional revisionTypeFieldName();
/**
* Enable the revision_on_collection_change feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#REVISION_ON_COLLECTION_CHANGE}.
*/
- @ConfigItem(defaultValue = "true")
- public boolean revisionOnCollectionChange;
+ @WithDefault("true")
+ boolean revisionOnCollectionChange();
/**
* Enable the do_not_audit_optimistic_locking_field feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#DO_NOT_AUDIT_OPTIMISTIC_LOCKING_FIELD}.
*/
- @ConfigItem(defaultValue = "true")
- public boolean doNotAuditOptimisticLockingField;
+ @WithDefault("true")
+ boolean doNotAuditOptimisticLockingField();
/**
* Defines the default schema of where audit tables are to be created.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#DEFAULT_SCHEMA}.
*/
- @ConfigItem(defaultValue = "")
- public Optional defaultSchema;
+ @WithDefault("")
+ Optional defaultSchema();
/**
* Defines the default catalog of where audit tables are to be created.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#DEFAULT_CATALOG}.
*/
- @ConfigItem(defaultValue = "")
- public Optional defaultCatalog;
+ @WithDefault("")
+ Optional defaultCatalog();
/**
* Enables the track_entities_changed_in_revision feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#TRACK_ENTITIES_CHANGED_IN_REVISION}.
*/
- @ConfigItem(defaultValue = "false")
- public boolean trackEntitiesChangedInRevision;
+ @WithDefault("false")
+ boolean trackEntitiesChangedInRevision();
/**
* Enables the use_revision_entity_with_native_id feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#USE_REVISION_ENTITY_WITH_NATIVE_ID}.
*/
- @ConfigItem(defaultValue = "true")
- public boolean useRevisionEntityWithNativeId;
+ @WithDefault("true")
+ boolean useRevisionEntityWithNativeId();
/**
* Enables the global_with_modified_flag feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#GLOBAL_WITH_MODIFIED_FLAG}.
*/
- @ConfigItem(defaultValue = "false")
- public boolean globalWithModifiedFlag;
+ @WithDefault("false")
+ boolean globalWithModifiedFlag();
/**
* Defines the suffix to be used for modified flag columns. Defaults to {@literal _MOD}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#MODIFIED_FLAG_SUFFIX}
*/
- @ConfigItem(defaultValue = "_MOD")
- public Optional modifiedFlagSuffix;
+ @WithDefault("_MOD")
+ Optional modifiedFlagSuffix();
/**
* Defines the fully qualified class name of a user defined revision listener.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#REVISION_LISTENER}.
*/
- @ConfigItem
- public Optional revisionListener;
+ Optional revisionListener();
/**
* Defines the fully qualified class name of the audit strategy to be used.
*
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#AUDIT_STRATEGY}.
*/
- @ConfigItem(defaultValue = "org.hibernate.envers.strategy.DefaultAuditStrategy")
- public Optional auditStrategy;
+ @WithDefault("org.hibernate.envers.strategy.DefaultAuditStrategy")
+ Optional auditStrategy();
/**
* Defines the property name for the audit entity's composite primary key. Defaults to {@literal originalId}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#ORIGINAL_ID_PROP_NAME}.
*/
- @ConfigItem(defaultValue = "originalId")
- public Optional originalIdPropName;
+ @WithDefault("originalId")
+ Optional originalIdPropName();
/**
* Defines the column name that holds the end revision number in audit entities. Defaults to {@literal REVEND}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#AUDIT_STRATEGY_VALIDITY_END_REV_FIELD_NAME}.
*/
- @ConfigItem(defaultValue = "REVEND")
- public Optional auditStrategyValidityEndRevFieldName;
+ @WithDefault("REVEND")
+ Optional auditStrategyValidityEndRevFieldName();
/**
* Enables the audit_strategy_validity_store_revend_timestamp feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP}.
*/
- @ConfigItem(defaultValue = "false")
- public boolean auditStrategyValidityStoreRevendTimestamp;
+ @WithDefault("false")
+ boolean auditStrategyValidityStoreRevendTimestamp();
/**
* Defines the column name of the revision end timestamp in the audit tables. Defaults to {@literal REVEND_TSTMP}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME}.
*/
- @ConfigItem(defaultValue = "REVEND_TSTMP")
- public Optional auditStrategyValidityRevendTimestampFieldName;
+ @WithDefault("REVEND_TSTMP")
+ Optional auditStrategyValidityRevendTimestampFieldName();
/**
* Defines the name of the column used for storing collection ordinal values for embeddable elements.
* Defaults to {@literal SETORDINAL}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#EMBEDDABLE_SET_ORDINAL_FIELD_NAME}.
*/
- @ConfigItem(defaultValue = "SETORDINAL")
- public Optional embeddableSetOrdinalFieldName;
+ @WithDefault("SETORDINAL")
+ Optional embeddableSetOrdinalFieldName();
/**
* Enables the allow_identifier_reuse feature.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#ALLOW_IDENTIFIER_REUSE}.
*/
- @ConfigItem(defaultValue = "false")
- public boolean allowIdentifierReuse;
+ @WithDefault("false")
+ boolean allowIdentifierReuse();
/**
* Defines the naming strategy to be used for modified columns.
* Defaults to {@literal org.hibernate.envers.boot.internal.LegacyModifiedColumnNamingStrategy}.
* Maps to {@link org.hibernate.envers.configuration.EnversSettings#MODIFIED_COLUMN_NAMING_STRATEGY}.
*/
- @ConfigItem(defaultValue = "org.hibernate.envers.boot.internal.LegacyModifiedColumnNamingStrategy")
- public Optional modifiedColumnNamingStrategy;
+ @WithDefault("org.hibernate.envers.boot.internal.LegacyModifiedColumnNamingStrategy")
+ Optional modifiedColumnNamingStrategy();
}
diff --git a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversRecorder.java b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversRecorder.java
index 6bcc24e51088fa..3c32373213baed 100644
--- a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversRecorder.java
+++ b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversRecorder.java
@@ -31,48 +31,48 @@ private HibernateEnversIntegrationStaticInitListener(HibernateEnversBuildTimeCon
@Override
public void contributeBootProperties(BiConsumer propertyCollector) {
- var puConfig = buildTimeConfig.getAllPersistenceUnitConfigsAsMap().get(puName);
+ var puConfig = buildTimeConfig.persistenceUnits().get(puName);
if (puConfig == null) {
// Leave Envers unconfigured, but still activate it.
return;
}
- if (puConfig.active.isPresent() && !puConfig.active.get()) {
+ if (puConfig.active().isPresent() && !puConfig.active().get()) {
propertyCollector.accept(EnversService.INTEGRATION_ENABLED, "false");
// Do not process other properties: Hibernate Envers is inactive anyway.
return;
}
- addConfig(propertyCollector, EnversSettings.STORE_DATA_AT_DELETE, puConfig.storeDataAtDelete);
- addConfig(propertyCollector, EnversSettings.AUDIT_TABLE_SUFFIX, puConfig.auditTableSuffix);
- addConfig(propertyCollector, EnversSettings.AUDIT_TABLE_PREFIX, puConfig.auditTablePrefix);
- addConfig(propertyCollector, EnversSettings.REVISION_FIELD_NAME, puConfig.revisionFieldName);
- addConfig(propertyCollector, EnversSettings.REVISION_TYPE_FIELD_NAME, puConfig.revisionTypeFieldName);
+ addConfig(propertyCollector, EnversSettings.STORE_DATA_AT_DELETE, puConfig.storeDataAtDelete());
+ addConfig(propertyCollector, EnversSettings.AUDIT_TABLE_SUFFIX, puConfig.auditTableSuffix());
+ addConfig(propertyCollector, EnversSettings.AUDIT_TABLE_PREFIX, puConfig.auditTablePrefix());
+ addConfig(propertyCollector, EnversSettings.REVISION_FIELD_NAME, puConfig.revisionFieldName());
+ addConfig(propertyCollector, EnversSettings.REVISION_TYPE_FIELD_NAME, puConfig.revisionTypeFieldName());
addConfig(propertyCollector, EnversSettings.REVISION_ON_COLLECTION_CHANGE,
- puConfig.revisionOnCollectionChange);
+ puConfig.revisionOnCollectionChange());
addConfig(propertyCollector, EnversSettings.DO_NOT_AUDIT_OPTIMISTIC_LOCKING_FIELD,
- puConfig.doNotAuditOptimisticLockingField);
- addConfig(propertyCollector, EnversSettings.DEFAULT_SCHEMA, puConfig.defaultSchema);
- addConfig(propertyCollector, EnversSettings.DEFAULT_CATALOG, puConfig.defaultCatalog);
+ puConfig.doNotAuditOptimisticLockingField());
+ addConfig(propertyCollector, EnversSettings.DEFAULT_SCHEMA, puConfig.defaultSchema());
+ addConfig(propertyCollector, EnversSettings.DEFAULT_CATALOG, puConfig.defaultCatalog());
addConfig(propertyCollector, EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION,
- puConfig.trackEntitiesChangedInRevision);
+ puConfig.trackEntitiesChangedInRevision());
addConfig(propertyCollector, EnversSettings.USE_REVISION_ENTITY_WITH_NATIVE_ID,
- puConfig.useRevisionEntityWithNativeId);
- addConfig(propertyCollector, EnversSettings.GLOBAL_WITH_MODIFIED_FLAG, puConfig.globalWithModifiedFlag);
- addConfig(propertyCollector, EnversSettings.MODIFIED_FLAG_SUFFIX, puConfig.modifiedFlagSuffix);
- addConfigIfPresent(propertyCollector, EnversSettings.REVISION_LISTENER, puConfig.revisionListener);
- addConfigIfPresent(propertyCollector, EnversSettings.AUDIT_STRATEGY, puConfig.auditStrategy);
- addConfigIfPresent(propertyCollector, EnversSettings.ORIGINAL_ID_PROP_NAME, puConfig.originalIdPropName);
+ puConfig.useRevisionEntityWithNativeId());
+ addConfig(propertyCollector, EnversSettings.GLOBAL_WITH_MODIFIED_FLAG, puConfig.globalWithModifiedFlag());
+ addConfig(propertyCollector, EnversSettings.MODIFIED_FLAG_SUFFIX, puConfig.modifiedFlagSuffix());
+ addConfigIfPresent(propertyCollector, EnversSettings.REVISION_LISTENER, puConfig.revisionListener());
+ addConfigIfPresent(propertyCollector, EnversSettings.AUDIT_STRATEGY, puConfig.auditStrategy());
+ addConfigIfPresent(propertyCollector, EnversSettings.ORIGINAL_ID_PROP_NAME, puConfig.originalIdPropName());
addConfigIfPresent(propertyCollector, EnversSettings.AUDIT_STRATEGY_VALIDITY_END_REV_FIELD_NAME,
- puConfig.auditStrategyValidityEndRevFieldName);
+ puConfig.auditStrategyValidityEndRevFieldName());
addConfig(propertyCollector, EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP,
- puConfig.auditStrategyValidityStoreRevendTimestamp);
+ puConfig.auditStrategyValidityStoreRevendTimestamp());
addConfigIfPresent(propertyCollector, EnversSettings.AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME,
- puConfig.auditStrategyValidityRevendTimestampFieldName);
+ puConfig.auditStrategyValidityRevendTimestampFieldName());
addConfigIfPresent(propertyCollector, EnversSettings.EMBEDDABLE_SET_ORDINAL_FIELD_NAME,
- puConfig.embeddableSetOrdinalFieldName);
- addConfig(propertyCollector, EnversSettings.ALLOW_IDENTIFIER_REUSE, puConfig.allowIdentifierReuse);
+ puConfig.embeddableSetOrdinalFieldName());
+ addConfig(propertyCollector, EnversSettings.ALLOW_IDENTIFIER_REUSE, puConfig.allowIdentifierReuse());
addConfigIfPresent(propertyCollector, EnversSettings.MODIFIED_COLUMN_NAMING_STRATEGY,
- puConfig.modifiedColumnNamingStrategy);
+ puConfig.modifiedColumnNamingStrategy());
}
public static void addConfig(BiConsumer propertyCollector, String configPath, T value) {
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java
index 6e593f48a71de8..861a6f9d099ab5 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java
@@ -17,17 +17,17 @@ public class HibernateConfigUtil {
public static Map getCacheConfigEntries(HibernateOrmConfigPersistenceUnit config) {
Map cacheRegionsConfigEntries = new HashMap<>();
- for (Map.Entry regionEntry : config.cache.entrySet()) {
+ for (Map.Entry regionEntry : config.cache().entrySet()) {
String regionName = regionEntry.getKey();
HibernateOrmConfigPersistenceUnitCache cacheConfig = regionEntry.getValue();
- if (cacheConfig.expiration.maxIdle.isPresent()) {
+ if (cacheConfig.expiration().maxIdle().isPresent()) {
cacheRegionsConfigEntries.put(getCacheConfigKey(regionName, EXPIRATION_MAX_IDLE),
- String.valueOf(cacheConfig.expiration.maxIdle.get().getSeconds()));
+ String.valueOf(cacheConfig.expiration().maxIdle().get().getSeconds()));
}
- if (cacheConfig.memory.objectCount.isPresent()) {
+ if (cacheConfig.memory().objectCount().isPresent()) {
cacheRegionsConfigEntries.put(getCacheConfigKey(regionName, MEMORY_OBJECT_COUNT),
- String.valueOf(cacheConfig.memory.objectCount.getAsLong()));
+ String.valueOf(cacheConfig.memory().objectCount().getAsLong()));
}
}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java
index fc207f65444c32..7a17d32e38408e 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java
@@ -1,5 +1,6 @@
package io.quarkus.hibernate.orm.deployment;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
@@ -11,6 +12,8 @@
import jakarta.enterprise.inject.Default;
import jakarta.enterprise.inject.Instance;
import jakarta.inject.Singleton;
+import jakarta.persistence.AttributeConverter;
+import jakarta.transaction.TransactionManager;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -31,6 +34,7 @@
import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
import io.quarkus.arc.deployment.SyntheticBeanBuildItem.ExtendedBeanConfigurator;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
import io.quarkus.arc.processor.AnnotationsTransformer;
import io.quarkus.arc.processor.DotNames;
@@ -42,12 +46,16 @@
import io.quarkus.deployment.annotations.BuildSteps;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.hibernate.orm.PersistenceUnit;
import io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder;
import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
import io.quarkus.hibernate.orm.runtime.JPAConfig;
import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+import io.quarkus.hibernate.orm.runtime.RequestScopedSessionHolder;
+import io.quarkus.hibernate.orm.runtime.RequestScopedStatelessSessionHolder;
import io.quarkus.hibernate.orm.runtime.TransactionSessions;
+import io.quarkus.hibernate.orm.runtime.cdi.QuarkusArcBeanContainer;
@BuildSteps(onlyIf = HibernateOrmEnabled.class)
public class HibernateOrmCdiProcessor {
@@ -182,7 +190,8 @@ void generateDataSourceBeans(HibernateOrmRecorder recorder,
.addInjectionPoint(ClassType.create(DotName.createSimple(JPAConfig.class)))
.done());
- if (capabilities.isPresent(Capability.TRANSACTIONS)) {
+ if (capabilities.isPresent(Capability.TRANSACTIONS)
+ && capabilities.isMissing(Capability.HIBERNATE_REACTIVE)) {
// Do register a Session/EntityManager bean only if JTA is available
// Note that the Hibernate Reactive extension excludes JTA intentionally
syntheticBeanBuildItemBuildProducer
@@ -222,7 +231,8 @@ void generateDataSourceBeans(HibernateOrmRecorder recorder,
.addInjectionPoint(ClassType.create(DotName.createSimple(JPAConfig.class)))
.done());
- if (capabilities.isPresent(Capability.TRANSACTIONS)) {
+ if (capabilities.isPresent(Capability.TRANSACTIONS)
+ && capabilities.isMissing(Capability.HIBERNATE_REACTIVE)) {
// Do register a Session/EntityManager bean only if JTA is available
// Note that the Hibernate Reactive extension excludes JTA intentionally
syntheticBeanBuildItemBuildProducer
@@ -245,6 +255,40 @@ void generateDataSourceBeans(HibernateOrmRecorder recorder,
}
}
+ @BuildStep
+ void registerBeans(HibernateOrmConfig hibernateOrmConfig,
+ BuildProducer additionalBeans,
+ BuildProducer unremovableBeans,
+ Capabilities capabilities,
+ CombinedIndexBuildItem combinedIndex,
+ List descriptors,
+ JpaModelBuildItem jpaModel) {
+ if (!HibernateOrmProcessor.hasEntities(jpaModel)) {
+ return;
+ }
+
+ List> unremovableClasses = new ArrayList<>();
+ unremovableClasses.add(QuarkusArcBeanContainer.class);
+
+ if (capabilities.isMissing(Capability.HIBERNATE_REACTIVE)) {
+ // The following beans only make sense for Hibernate ORM, not for Hibernate Reactive
+
+ if (capabilities.isPresent(Capability.TRANSACTIONS)) {
+ unremovableClasses.add(TransactionManager.class);
+ unremovableClasses.add(TransactionSessions.class);
+ }
+ unremovableClasses.add(RequestScopedSessionHolder.class);
+ unremovableClasses.add(RequestScopedStatelessSessionHolder.class);
+ }
+ additionalBeans.produce(AdditionalBeanBuildItem.builder().setUnremovable()
+ .addBeanClasses(unremovableClasses.toArray(new Class[unremovableClasses.size()]))
+ .build());
+
+ // Some user-injectable beans are retrieved programmatically and shouldn't be removed
+ unremovableBeans.produce(UnremovableBeanBuildItem.beanTypes(AttributeConverter.class));
+ unremovableBeans.produce(UnremovableBeanBuildItem.beanTypes(jpaModel.getPotentialCdiBeanClassNames()));
+ }
+
@BuildStep
void registerAnnotations(BuildProducer additionalBeans,
BuildProducer beanDefiningAnnotations) {
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java
index e2be11c863d715..32e60b297619c8 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java
@@ -9,12 +9,18 @@
import io.quarkus.runtime.annotations.ConfigDocMapKey;
import io.quarkus.runtime.annotations.ConfigDocSection;
import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigRoot;
-import io.quarkus.runtime.annotations.ConvertWith;
-
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithConverter;
+import io.smallrye.config.WithDefault;
+import io.smallrye.config.WithDefaults;
+import io.smallrye.config.WithName;
+import io.smallrye.config.WithParentName;
+import io.smallrye.config.WithUnnamedKey;
+
+@ConfigMapping(prefix = "quarkus.hibernate-orm")
@ConfigRoot
-public class HibernateOrmConfig {
+public interface HibernateOrmConfig {
/**
* Whether Hibernate ORM is enabled *during the build*.
@@ -25,49 +31,51 @@ public class HibernateOrmConfig {
*
* @asciidoclet
*/
- @ConfigItem(defaultValue = "true")
- public boolean enabled;
+ @WithDefault("true")
+ boolean enabled();
/**
* Database related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigDatabase database;
-
- /**
- * Configuration for the default persistence unit.
- */
- @ConfigItem(name = ConfigItem.PARENT)
- public HibernateOrmConfigPersistenceUnit defaultPersistenceUnit;
+ HibernateOrmConfigDatabase database();
/**
- * Additional named persistence units.
+ * Configuration for persistence units.
*/
- @ConfigDocSection
+ @WithParentName
+ @WithUnnamedKey(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME)
+ @WithDefaults
@ConfigDocMapKey("persistence-unit-name")
- @ConfigItem(name = ConfigItem.PARENT)
- public Map persistenceUnits;
+ Map persistenceUnits();
+
+ default HibernateOrmConfigPersistenceUnit defaultPersistenceUnit() {
+ return persistenceUnits().get(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
+ }
+
+ default Map namedPersistenceUnits() {
+ Map map = new TreeMap<>();
+ map.putAll(persistenceUnits());
+ map.remove(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
+ return map;
+ }
/**
* Configuration for the {@code persistence.xml} handling.
*/
- @ConfigItem
- public HibernateOrmConfigPersistenceXml persistenceXml;
+ HibernateOrmConfigPersistenceXml persistenceXml();
/**
* Logging configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigLog log;
+ HibernateOrmConfigLog log();
/**
* Whether statistics collection is enabled. If 'metrics.enabled' is true, then the default here is
* considered true, otherwise the default is false.
*/
- @ConfigItem
- public Optional statistics;
+ Optional statistics();
/**
* Whether session metrics should be appended into the server log for each Hibernate session. This
@@ -75,73 +83,62 @@ public class HibernateOrmConfig {
* (which means both `statistics` and `log-session-metrics` need to be enabled for the session metrics
* to appear in the log).
*/
- @ConfigItem
- public Optional logSessionMetrics;
+ Optional logSessionMetrics();
/**
* Configuration related to metrics.
*/
- @ConfigItem
- public HibernateOrmConfigMetric metrics;
+ HibernateOrmConfigMetric metrics();
- public boolean isAnyNonPersistenceXmlPropertySet() {
+ default boolean isAnyNonPersistenceXmlPropertySet() {
// Do NOT include persistenceXml in here.
- return defaultPersistenceUnit.isAnyPropertySet() ||
- !persistenceUnits.isEmpty() ||
- log.isAnyPropertySet() ||
- statistics.isPresent() ||
- logSessionMetrics.isPresent() ||
- metrics.isAnyPropertySet();
- }
-
- public Map getAllPersistenceUnitConfigsAsMap() {
- Map map = new TreeMap<>();
- if (defaultPersistenceUnit != null) {
- map.put(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, defaultPersistenceUnit);
- }
- map.putAll(persistenceUnits);
- return map;
+ return defaultPersistenceUnit().isAnyPropertySet() ||
+ !namedPersistenceUnits().isEmpty() ||
+ log().isAnyPropertySet() ||
+ statistics().isPresent() ||
+ logSessionMetrics().isPresent() ||
+ metrics().isAnyPropertySet();
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceXml {
+ interface HibernateOrmConfigPersistenceXml {
/**
* If {@code true}, Quarkus will ignore any {@code persistence.xml} file in the classpath
* and rely exclusively on the Quarkus configuration.
*/
- @ConfigItem
- public boolean ignore;
+ @WithDefault("false")
+ boolean ignore();
}
@ConfigGroup
- public static class HibernateOrmConfigLog {
+ interface HibernateOrmConfigLog {
/**
* Logs SQL bind parameter.
*
* Setting it to true is obviously not recommended in production.
*/
- @ConfigItem
@Deprecated
- public boolean bindParam;
+ @WithDefault("false")
+ boolean bindParam();
/**
* Logs SQL bind parameters.
*
* Setting it to true is obviously not recommended in production.
*/
- @ConfigItem
- public boolean bindParameters;
+ @WithDefault("false")
+ boolean bindParameters();
- public boolean isAnyPropertySet() {
- return bindParam || bindParameters;
+ default boolean isAnyPropertySet() {
+ return bindParam() || bindParameters();
}
}
@ConfigGroup
- public static class HibernateOrmConfigDatabase {
+ interface HibernateOrmConfigDatabase {
/**
* When set, attempts to exchange data with the database
* as the given version of Hibernate ORM would have,
@@ -165,22 +162,23 @@ public static class HibernateOrmConfigDatabase {
*
* @asciidoclet
*/
- @ConfigItem(name = "orm-compatibility.version", defaultValue = "latest")
- @ConvertWith(DatabaseOrmCompatibilityVersion.Converter.class)
- public DatabaseOrmCompatibilityVersion ormCompatibilityVersion;
+ @WithName("orm-compatibility.version")
+ @WithDefault("latest")
+ @WithConverter(DatabaseOrmCompatibilityVersion.Converter.class)
+ DatabaseOrmCompatibilityVersion ormCompatibilityVersion();
}
@ConfigGroup
- public static class HibernateOrmConfigMetric {
+ interface HibernateOrmConfigMetric {
/**
* Whether metrics are published if a metrics extension is enabled.
*/
- @ConfigItem
- public boolean enabled;
+ @WithDefault("false")
+ boolean enabled();
- public boolean isAnyPropertySet() {
- return enabled;
+ default boolean isAnyPropertySet() {
+ return enabled();
}
}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java
index f87622b5957a0c..bdf64462f2836f 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java
@@ -2,7 +2,6 @@
import java.nio.charset.Charset;
import java.time.Duration;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -13,38 +12,38 @@
import org.hibernate.annotations.TimeZoneStorageType;
import org.hibernate.id.enhanced.StandardOptimizerDescriptor;
+import io.quarkus.runtime.annotations.ConfigDocDefault;
+import io.quarkus.runtime.annotations.ConfigDocIgnore;
import io.quarkus.runtime.annotations.ConfigDocMapKey;
import io.quarkus.runtime.annotations.ConfigDocSection;
import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConvertWith;
import io.quarkus.runtime.configuration.TrimmedStringConverter;
+import io.smallrye.config.WithConverter;
+import io.smallrye.config.WithDefault;
+import io.smallrye.config.WithName;
+import io.smallrye.config.WithParentName;
@ConfigGroup
-public class HibernateOrmConfigPersistenceUnit {
+public interface HibernateOrmConfigPersistenceUnit {
/**
* The name of the datasource which this persistence unit uses.
*
* If undefined, it will use the default datasource.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional datasource;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional datasource();
/**
* The packages in which the entities affected to this persistence unit are located.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional> packages;
+ Optional> packages();
/**
* Dialect related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitDialect dialect;
+ HibernateOrmConfigPersistenceUnitDialect dialect();
// @formatter:off
/**
@@ -83,9 +82,8 @@ public class HibernateOrmConfigPersistenceUnit {
* @asciidoclet
*/
// @formatter:on
- @ConfigItem(defaultValueDocumentation = "import.sql in DEV, TEST ; no-file otherwise")
- @ConvertWith(TrimmedStringConverter.class)
- public Optional> sqlLoadScript;
+ @ConfigDocDefault("import.sql in DEV, TEST ; no-file otherwise")
+ Optional> sqlLoadScript();
/**
* The size of the batches used when loading entities and collections.
@@ -95,9 +93,9 @@ public class HibernateOrmConfigPersistenceUnit {
* @deprecated {@link #fetch} should be used to configure fetching properties.
* @asciidoclet
*/
- @ConfigItem(defaultValueDocumentation = "16")
+ @ConfigDocDefault("16")
@Deprecated
- public OptionalInt batchFetchSize;
+ OptionalInt batchFetchSize();
/**
* The maximum depth of outer join fetch tree for single-ended associations (one-to-one, many-to-one).
@@ -107,27 +105,24 @@ public class HibernateOrmConfigPersistenceUnit {
* @deprecated {@link #fetch} should be used to configure fetching properties.
* @asciidoclet
*/
- @ConfigItem
@Deprecated
- public OptionalInt maxFetchDepth;
+ OptionalInt maxFetchDepth();
/**
* Pluggable strategy contract for applying physical naming rules for database object names.
*
* Class name of the Hibernate PhysicalNamingStrategy implementation
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional physicalNamingStrategy;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional physicalNamingStrategy();
/**
* Pluggable strategy for applying implicit naming rules when an explicit name is not given.
*
* Class name of the Hibernate ImplicitNamingStrategy implementation
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional implicitNamingStrategy;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional implicitNamingStrategy();
/**
* Class name of a custom
@@ -145,9 +140,8 @@ public class HibernateOrmConfigPersistenceUnit {
*
* @asciidoclet
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional metadataBuilderContributor;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional metadataBuilderContributor();
/**
* XML files to configure the entity mapping, e.g. {@code META-INF/my-orm.xml}.
@@ -155,64 +149,55 @@ public class HibernateOrmConfigPersistenceUnit {
* Defaults to `META-INF/orm.xml` if it exists.
* Pass `no-file` to force Hibernate ORM to ignore `META-INF/orm.xml`.
*/
- @ConfigItem(defaultValueDocumentation = "META-INF/orm.xml if it exists; no-file otherwise")
- @ConvertWith(TrimmedStringConverter.class)
- public Optional> mappingFiles;
+ @ConfigDocDefault("META-INF/orm.xml if it exists; no-file otherwise")
+ Optional> mappingFiles();
/**
* Mapping configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitMapping mapping;
+ HibernateOrmConfigPersistenceUnitMapping mapping();
/**
* Query related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitQuery query;
+ HibernateOrmConfigPersistenceUnitQuery query();
/**
* Database related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitDatabase database;
+ HibernateOrmConfigPersistenceUnitDatabase database();
/**
* JDBC related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitJdbc jdbc;
+ HibernateOrmConfigPersistenceUnitJdbc jdbc();
/**
* Fetching logic configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitFetch fetch;
+ HibernateOrmConfigPersistenceUnitFetch fetch();
/**
* Caching configuration
*/
- @ConfigItem
@ConfigDocSection
- public Map cache;
+ Map cache();
/**
* Discriminator related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitDiscriminator discriminator;
+ HibernateOrmConfigPersistenceUnitDiscriminator discriminator();
/**
* Config related to identifier quoting.
*/
- @ConfigItem(defaultValue = "none")
- public HibernateOrmConfigPersistenceUnitQuoteIdentifiers quoteIdentifiers;
+ HibernateOrmConfigPersistenceUnitQuoteIdentifiers quoteIdentifiers();
/**
* The default in Quarkus is for 2nd level caching to be enabled,
@@ -222,14 +207,13 @@ public class HibernateOrmConfigPersistenceUnit {
*
* Set this to false to disable all 2nd level caches.
*/
- @ConfigItem(defaultValue = "true")
- public boolean secondLevelCachingEnabled;
+ @WithDefault("true")
+ boolean secondLevelCachingEnabled();
/**
* Bean Validation configuration.
*/
- @ConfigItem
- public HibernateOrmConfigPersistenceValidation validation;
+ HibernateOrmConfigPersistenceValidation validation();
/**
* Defines the method for multi-tenancy (DATABASE, NONE, SCHEMA). The complete list of allowed values is available in the
@@ -239,56 +223,54 @@ public class HibernateOrmConfigPersistenceUnit {
*
* @asciidoclet
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional multitenant;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional multitenant();
/**
* Defines the name of the datasource to use in case of SCHEMA approach. The datasource of the persistence unit will be used
* if not set.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional multitenantSchemaDatasource;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional multitenantSchemaDatasource();
/**
* If hibernate is not auto generating the schema, and Quarkus is running in development mode
* then Quarkus will attempt to validate the database after startup and print a log message if
* there are any problems.
*/
- @ConfigItem(defaultValue = "true")
- public boolean validateInDevMode;
+ @WithDefault("true")
+ boolean validateInDevMode();
- @ConfigItem(generateDocumentation = false)
+ @ConfigDocIgnore
@ConfigDocMapKey("full-property-key")
- public Map unsupportedProperties = new HashMap<>();
-
- public boolean isAnyPropertySet() {
- return datasource.isPresent() ||
- packages.isPresent() ||
- dialect.isAnyPropertySet() ||
- sqlLoadScript.isPresent() ||
- batchFetchSize.isPresent() ||
- maxFetchDepth.isPresent() ||
- physicalNamingStrategy.isPresent() ||
- implicitNamingStrategy.isPresent() ||
- metadataBuilderContributor.isPresent() ||
- mapping.isAnyPropertySet() ||
- query.isAnyPropertySet() ||
- database.isAnyPropertySet() ||
- jdbc.isAnyPropertySet() ||
- !cache.isEmpty() ||
- !secondLevelCachingEnabled ||
- multitenant.isPresent() ||
- multitenantSchemaDatasource.isPresent() ||
- fetch.isAnyPropertySet() ||
- discriminator.isAnyPropertySet() ||
- quoteIdentifiers.isAnyPropertySet() ||
- !unsupportedProperties.isEmpty();
+ Map unsupportedProperties();
+
+ default boolean isAnyPropertySet() {
+ return datasource().isPresent() ||
+ packages().isPresent() ||
+ dialect().isAnyPropertySet() ||
+ sqlLoadScript().isPresent() ||
+ batchFetchSize().isPresent() ||
+ maxFetchDepth().isPresent() ||
+ physicalNamingStrategy().isPresent() ||
+ implicitNamingStrategy().isPresent() ||
+ metadataBuilderContributor().isPresent() ||
+ mapping().isAnyPropertySet() ||
+ query().isAnyPropertySet() ||
+ database().isAnyPropertySet() ||
+ jdbc().isAnyPropertySet() ||
+ !cache().isEmpty() ||
+ !secondLevelCachingEnabled() ||
+ multitenant().isPresent() ||
+ multitenantSchemaDatasource().isPresent() ||
+ fetch().isAnyPropertySet() ||
+ discriminator().isAnyPropertySet() ||
+ quoteIdentifiers().isAnyPropertySet() ||
+ !unsupportedProperties().isEmpty();
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitDialect {
+ interface HibernateOrmConfigPersistenceUnitDialect {
/**
* Class name of the Hibernate ORM dialect.
@@ -313,9 +295,10 @@ public static class HibernateOrmConfigPersistenceUnitDialect {
*
* @asciidoclet
*/
- @ConfigItem(name = ConfigItem.PARENT, defaultValueDocumentation = "selected automatically for most popular databases")
- @ConvertWith(TrimmedStringConverter.class)
- public Optional dialect;
+ @WithParentName
+ @ConfigDocDefault("selected automatically for most popular databases")
+ @WithConverter(TrimmedStringConverter.class)
+ Optional dialect();
/**
* The storage engine to use when the dialect supports multiple storage engines.
@@ -324,12 +307,11 @@ public static class HibernateOrmConfigPersistenceUnitDialect {
*
* @asciidoclet
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional storageEngine;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional storageEngine();
- public boolean isAnyPropertySet() {
- return dialect.isPresent() || storageEngine.isPresent();
+ default boolean isAnyPropertySet() {
+ return dialect().isPresent() || storageEngine().isPresent();
}
}
@@ -337,21 +319,19 @@ public boolean isAnyPropertySet() {
* Mapping-related configuration.
*/
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitMapping {
+ interface HibernateOrmConfigPersistenceUnitMapping {
/**
* Timezone configuration.
*/
- @ConfigItem
- public Timezone timezone;
+ Timezone timezone();
/**
* Optimizer configuration.
*/
- @ConfigItem
- public Id id;
+ Id id();
@ConfigGroup
- public static class Timezone {
+ interface Timezone {
/**
* How to store timezones in the database by default
* for properties of type `OffsetDateTime` and `ZonedDateTime`.
@@ -391,20 +371,20 @@ public static class Timezone {
*
* @asciidoclet
*/
- @ConfigItem(name = "default-storage", defaultValueDocumentation = "default")
- public Optional timeZoneDefaultStorage;
+ @WithName("default-storage")
+ @ConfigDocDefault("default")
+ Optional timeZoneDefaultStorage();
}
@ConfigGroup
- public static class Id {
+ interface Id {
/**
* Optimizer configuration.
*/
- @ConfigItem
- public Optimizer optimizer;
+ Optimizer optimizer();
@ConfigGroup
- public static class Optimizer {
+ interface Optimizer {
/**
* The optimizer to apply to identifier generators
* whose optimizer is not configured explicitly.
@@ -418,24 +398,25 @@ public static class Optimizer {
*
* @asciidoclet
*/
- @ConfigItem(name = "default", defaultValueDocumentation = "pooled-lo")
+ @WithName("default")
+ @ConfigDocDefault("pooled-lo")
// Note this needs to be a build-time property due to
// org.hibernate.boot.internal.InFlightMetadataCollectorImpl.handleIdentifierValueBinding
// which may call (indirectly) org.hibernate.id.enhanced.SequenceStructure.buildSequence
// whose output depends on org.hibernate.id.enhanced.SequenceStructure.applyIncrementSizeToSourceValues
// which is determined by the optimizer.
- public Optional idOptimizerDefault;
+ Optional idOptimizerDefault();
}
}
- public boolean isAnyPropertySet() {
- return timezone.timeZoneDefaultStorage.isPresent()
- || id.optimizer.idOptimizerDefault.isPresent();
+ default boolean isAnyPropertySet() {
+ return timezone().timeZoneDefaultStorage().isPresent()
+ || id().optimizer().idOptimizerDefault().isPresent();
}
}
- public enum IdOptimizerType {
+ enum IdOptimizerType {
/**
* Assumes the value retrieved from the table/sequence is the lower end of the pool.
*
@@ -489,11 +470,11 @@ public enum IdOptimizerType {
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitQuery {
+ interface HibernateOrmConfigPersistenceUnitQuery {
- private static final int DEFAULT_QUERY_PLAN_CACHE_MAX_SIZE = 2048;
+ int DEFAULT_QUERY_PLAN_CACHE_MAX_SIZE = 2048;
- public enum NullOrdering {
+ enum NullOrdering {
NONE,
FIRST,
LAST
@@ -503,8 +484,8 @@ public enum NullOrdering {
* The maximum size of the query plan cache.
* see #{@value org.hibernate.cfg.AvailableSettings#QUERY_PLAN_CACHE_MAX_SIZE}
*/
- @ConfigItem(defaultValue = "2048")
- public int queryPlanCacheMaxSize;
+ @WithDefault("2048")
+ int queryPlanCacheMaxSize();
/**
* Default precedence of null values in `ORDER BY` clauses.
@@ -513,114 +494,107 @@ public enum NullOrdering {
*
* @asciidoclet
*/
- @ConfigItem(defaultValue = "none")
- public NullOrdering defaultNullOrdering;
+ @WithDefault("none")
+ NullOrdering defaultNullOrdering();
/**
* Enables IN clause parameter padding which improves statement caching.
*/
- @ConfigItem(defaultValue = "true")
- public boolean inClauseParameterPadding;
+ @WithDefault("true")
+ boolean inClauseParameterPadding();
- public boolean isAnyPropertySet() {
- return queryPlanCacheMaxSize != DEFAULT_QUERY_PLAN_CACHE_MAX_SIZE
- || defaultNullOrdering != NullOrdering.NONE
- || !inClauseParameterPadding;
+ default boolean isAnyPropertySet() {
+ return queryPlanCacheMaxSize() != DEFAULT_QUERY_PLAN_CACHE_MAX_SIZE
+ || defaultNullOrdering() != NullOrdering.NONE
+ || !inClauseParameterPadding();
}
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitDatabase {
+ interface HibernateOrmConfigPersistenceUnitDatabase {
- private static final String DEFAULT_CHARSET = "UTF-8";
+ String DEFAULT_CHARSET = "UTF-8";
/**
* The charset of the database.
*
* Used for DDL generation and also for the SQL import scripts.
*/
- @ConfigItem(defaultValue = DEFAULT_CHARSET)
- public Charset charset;
+ @WithDefault(DEFAULT_CHARSET)
+ Charset charset();
/**
* Whether Hibernate should quote all identifiers.
*
* @deprecated {@link #quoteIdentifiers} should be used to configure quoting strategy.
*/
- @ConfigItem
@Deprecated
- public boolean globallyQuotedIdentifiers;
+ @WithDefault("false")
+ boolean globallyQuotedIdentifiers();
- public boolean isAnyPropertySet() {
- return !DEFAULT_CHARSET.equals(charset.name())
- || globallyQuotedIdentifiers;
+ default boolean isAnyPropertySet() {
+ return !DEFAULT_CHARSET.equals(charset().name())
+ || globallyQuotedIdentifiers();
}
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitJdbc {
+ interface HibernateOrmConfigPersistenceUnitJdbc {
/**
* The time zone pushed to the JDBC driver.
*
* See `quarkus.hibernate-orm.mapping.timezone.default-storage`.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional timezone;
+ @WithConverter(TrimmedStringConverter.class)
+ Optional timezone();
/**
* How many rows are fetched at a time by the JDBC driver.
*/
- @ConfigItem
- public OptionalInt statementFetchSize;
+ OptionalInt statementFetchSize();
/**
* The number of updates (inserts, updates and deletes) that are sent by the JDBC driver at one time for execution.
*/
- @ConfigItem
- public OptionalInt statementBatchSize;
+ OptionalInt statementBatchSize();
- public boolean isAnyPropertySet() {
- return timezone.isPresent() || statementFetchSize.isPresent() || statementBatchSize.isPresent();
+ default boolean isAnyPropertySet() {
+ return timezone().isPresent() || statementFetchSize().isPresent() || statementBatchSize().isPresent();
}
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitCache {
+ interface HibernateOrmConfigPersistenceUnitCache {
/**
* The cache expiration configuration.
*/
- @ConfigItem
- public HibernateOrmConfigPersistenceUnitCacheExpiration expiration;
+ HibernateOrmConfigPersistenceUnitCacheExpiration expiration();
/**
* The cache memory storage configuration.
*/
- @ConfigItem
- public HibernateOrmConfigPersistenceUnitCacheMemory memory;
+ HibernateOrmConfigPersistenceUnitCacheMemory memory();
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitCacheExpiration {
+ interface HibernateOrmConfigPersistenceUnitCacheExpiration {
/**
* The maximum time before an object of the cache is considered expired.
*/
- @ConfigItem
- public Optional maxIdle;
+ Optional maxIdle();
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitCacheMemory {
+ interface HibernateOrmConfigPersistenceUnitCacheMemory {
/**
* The maximum number of objects kept in memory in the cache.
*/
- @ConfigItem
- public OptionalLong objectCount;
+ OptionalLong objectCount();
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitFetch {
+ interface HibernateOrmConfigPersistenceUnitFetch {
/**
* The size of the batches used when loading entities and collections.
*
@@ -628,8 +602,8 @@ public static class HibernateOrmConfigPersistenceUnitFetch {
*
* @asciidoclet
*/
- @ConfigItem(defaultValueDocumentation = "16")
- public OptionalInt batchSize;
+ @ConfigDocDefault("16")
+ OptionalInt batchSize();
/**
* The maximum depth of outer join fetch tree for single-ended associations (one-to-one, many-to-one).
@@ -638,17 +612,16 @@ public static class HibernateOrmConfigPersistenceUnitFetch {
*
* @asciidoclet
*/
- @ConfigItem
- public OptionalInt maxDepth;
+ OptionalInt maxDepth();
- public boolean isAnyPropertySet() {
- return batchSize.isPresent() || maxDepth.isPresent();
+ default boolean isAnyPropertySet() {
+ return batchSize().isPresent() || maxDepth().isPresent();
}
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitQuoteIdentifiers {
+ interface HibernateOrmConfigPersistenceUnitQuoteIdentifiers {
/**
* Identifiers can be quoted using one of the available strategies.
@@ -660,11 +633,11 @@ public static class HibernateOrmConfigPersistenceUnitQuoteIdentifiers {
* only
* identifiers deemed SQL keywords by the Hibernate ORM dialect.
*/
- @ConfigItem(defaultValue = "none")
- public IdentifierQuotingStrategy strategy;
+ @WithDefault("none")
+ IdentifierQuotingStrategy strategy();
- public boolean isAnyPropertySet() {
- return strategy != IdentifierQuotingStrategy.NONE;
+ default boolean isAnyPropertySet() {
+ return strategy() != IdentifierQuotingStrategy.NONE;
}
}
@@ -674,21 +647,21 @@ public boolean isAnyPropertySet() {
* Separated in a group configuration, in case it is necessary to add the another existing hibernate discriminator property.
*/
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitDiscriminator {
+ interface HibernateOrmConfigPersistenceUnitDiscriminator {
/**
* Existing applications rely (implicitly or explicitly) on Hibernate ignoring any DiscriminatorColumn declarations on
* joined inheritance hierarchies. This setting allows these applications to maintain the legacy behavior of
* DiscriminatorColumn annotations being ignored when paired with joined inheritance.
*/
- @ConfigItem
- public boolean ignoreExplicitForJoined;
+ @WithDefault("false")
+ boolean ignoreExplicitForJoined();
- public boolean isAnyPropertySet() {
- return ignoreExplicitForJoined;
+ default boolean isAnyPropertySet() {
+ return ignoreExplicitForJoined();
}
}
- public enum IdentifierQuotingStrategy {
+ enum IdentifierQuotingStrategy {
NONE,
ALL,
ALL_EXCEPT_COLUMN_DEFINITIONS,
@@ -696,13 +669,13 @@ public enum IdentifierQuotingStrategy {
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceValidation {
+ interface HibernateOrmConfigPersistenceValidation {
/**
* Enables the Bean Validation integration.
*/
- @ConfigItem(defaultValue = "true")
- public boolean enabled;
+ @WithDefault("true")
+ boolean enabled();
}
}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmEnabled.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmEnabled.java
index b5ed9ddb3183cb..7e9d0c63c43046 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmEnabled.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmEnabled.java
@@ -16,7 +16,7 @@ public class HibernateOrmEnabled implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
- return config.enabled;
+ return config.enabled();
}
}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
index 2ad2bb9e78ac7d..c93d00b8ce5a79 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -36,11 +36,9 @@
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;
-import jakarta.persistence.AttributeConverter;
import jakarta.persistence.SharedCacheMode;
import jakarta.persistence.ValidationMode;
import jakarta.persistence.spi.PersistenceUnitTransactionType;
-import jakarta.transaction.TransactionManager;
import jakarta.xml.bind.JAXBElement;
import org.hibernate.boot.archive.scan.spi.ClassDescriptor;
@@ -66,7 +64,6 @@
import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
import io.quarkus.agroal.spi.JdbcDataSourceSchemaReadyBuildItem;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.arc.deployment.BeanContainerBuildItem;
import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
import io.quarkus.arc.deployment.RecorderBeanInitializedBuildItem;
@@ -120,15 +117,11 @@
import io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder;
import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
-import io.quarkus.hibernate.orm.runtime.RequestScopedSessionHolder;
-import io.quarkus.hibernate.orm.runtime.RequestScopedStatelessSessionHolder;
-import io.quarkus.hibernate.orm.runtime.TransactionSessions;
import io.quarkus.hibernate.orm.runtime.boot.QuarkusPersistenceUnitDefinition;
import io.quarkus.hibernate.orm.runtime.boot.scan.QuarkusScanner;
import io.quarkus.hibernate.orm.runtime.boot.xml.JAXBElementSubstitution;
import io.quarkus.hibernate.orm.runtime.boot.xml.QNameSubstitution;
import io.quarkus.hibernate.orm.runtime.boot.xml.RecordableXmlMapping;
-import io.quarkus.hibernate.orm.runtime.cdi.QuarkusArcBeanContainer;
import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
import io.quarkus.hibernate.orm.runtime.dev.HibernateOrmDevIntegrator;
import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticDescriptor;
@@ -202,10 +195,10 @@ void checkTransactionsSupport(Capabilities capabilities, BuildProducer additionalApplicationArchiveMarkers) {
- for (HibernateOrmConfigPersistenceUnit persistenceUnit : hibernateOrmConfig.getAllPersistenceUnitConfigsAsMap()
+ for (HibernateOrmConfigPersistenceUnit persistenceUnit : hibernateOrmConfig.persistenceUnits()
.values()) {
- if (persistenceUnit.packages.isPresent()) {
- for (String pakkage : persistenceUnit.packages.get()) {
+ if (persistenceUnit.packages().isPresent()) {
+ for (String pakkage : persistenceUnit.packages().get()) {
additionalApplicationArchiveMarkers
.produce(new AdditionalApplicationArchiveMarkerBuildItem(pakkage.replace('.', '/')));
}
@@ -217,8 +210,8 @@ void includeArchivesHostingEntityPackagesInIndex(HibernateOrmConfig hibernateOrm
@Consume(ServiceStartBuildItem.class)
@BuildStep(onlyIf = IsDevelopment.class)
void warnOfSchemaProblems(HibernateOrmConfig config, HibernateOrmRecorder recorder) {
- for (var e : config.getAllPersistenceUnitConfigsAsMap().entrySet()) {
- if (e.getValue().validateInDevMode) {
+ for (var e : config.persistenceUnits().entrySet()) {
+ if (e.getValue().validateInDevMode()) {
recorder.doValidation(e.getKey());
}
}
@@ -323,7 +316,7 @@ public void configurationDescriptorBuilding(
getMultiTenancyStrategy(
Optional.ofNullable(persistenceXmlDescriptorBuildItem.getDescriptor()
.getProperties().getProperty("hibernate.multiTenancy"))), //FIXME this property is meaningless in Hibernate ORM 6
- hibernateOrmConfig.database.ormCompatibilityVersion, Collections.emptyMap()),
+ hibernateOrmConfig.database().ormCompatibilityVersion(), Collections.emptyMap()),
null,
jpaModel.getXmlMappings(persistenceXmlDescriptorBuildItem.getDescriptor().getName()),
false, true, capabilities));
@@ -377,13 +370,13 @@ public void contributePersistenceXmlToJpaModel(
public void contributeQuarkusConfigToJpaModel(
BuildProducer jpaModelPuContributions,
HibernateOrmConfig hibernateOrmConfig) {
- for (Entry entry : hibernateOrmConfig.getAllPersistenceUnitConfigsAsMap()
+ for (Entry entry : hibernateOrmConfig.persistenceUnits()
.entrySet()) {
String name = entry.getKey();
HibernateOrmConfigPersistenceUnit config = entry.getValue();
jpaModelPuContributions.produce(new JpaModelPersistenceUnitContributionBuildItem(
name, null, Collections.emptySet(),
- config.mappingFiles.orElse(Collections.emptySet())));
+ config.mappingFiles().orElse(Collections.emptySet())));
}
}
@@ -592,36 +585,6 @@ void handleNativeImageImportSql(BuildProducer reso
}
}
- @BuildStep
- void registerBeans(HibernateOrmConfig hibernateOrmConfig,
- BuildProducer additionalBeans,
- BuildProducer unremovableBeans,
- Capabilities capabilities,
- CombinedIndexBuildItem combinedIndex,
- List descriptors,
- JpaModelBuildItem jpaModel) {
- if (!hasEntities(jpaModel)) {
- return;
- }
-
- List> unremovableClasses = new ArrayList<>();
- if (capabilities.isPresent(Capability.TRANSACTIONS)) {
- unremovableClasses.add(TransactionManager.class);
- unremovableClasses.add(TransactionSessions.class);
- }
- unremovableClasses.add(RequestScopedSessionHolder.class);
- unremovableClasses.add(RequestScopedStatelessSessionHolder.class);
- unremovableClasses.add(QuarkusArcBeanContainer.class);
-
- additionalBeans.produce(AdditionalBeanBuildItem.builder().setUnremovable()
- .addBeanClasses(unremovableClasses.toArray(new Class[unremovableClasses.size()]))
- .build());
-
- // Some user-injectable beans are retrieved programmatically and shouldn't be removed
- unremovableBeans.produce(UnremovableBeanBuildItem.beanTypes(AttributeConverter.class));
- unremovableBeans.produce(UnremovableBeanBuildItem.beanTypes(jpaModel.getPotentialCdiBeanClassNames()));
- }
-
@Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class)
@BuildStep
@SuppressWarnings("deprecation")
@@ -743,7 +706,7 @@ public void multitenancy(HibernateOrmRecorder recorder,
@BuildStep
public void produceLoggingCategories(HibernateOrmConfig hibernateOrmConfig,
BuildProducer categories) {
- if (hibernateOrmConfig.log.bindParam || hibernateOrmConfig.log.bindParameters) {
+ if (hibernateOrmConfig.log().bindParam() || hibernateOrmConfig.log().bindParameters()) {
categories.produce(new LogCategoryBuildItem("org.hibernate.orm.jdbc.bind", Level.TRACE, true));
}
}
@@ -801,7 +764,7 @@ private static List getSqlLoadScript(Optional> sqlLoadScrip
}
}
- private boolean hasEntities(JpaModelBuildItem jpaModel) {
+ static boolean hasEntities(JpaModelBuildItem jpaModel) {
return !jpaModel.getEntityClassNames().isEmpty();
}
@@ -820,7 +783,7 @@ private void handleHibernateORMWithNoPersistenceXml(
BuildProducer persistenceUnitDescriptors,
List dbKindMetadataBuildItems) {
if (!descriptors.isEmpty()) {
- if (hibernateOrmConfig.isAnyNonPersistenceXmlPropertySet() || !hibernateOrmConfig.persistenceUnits.isEmpty()) {
+ if (hibernateOrmConfig.isAnyNonPersistenceXmlPropertySet()) {
throw new ConfigurationException(
"A legacy persistence.xml file is present in the classpath, but Hibernate ORM is also configured through the Quarkus config file.\n"
+ "Legacy persistence.xml files and Quarkus configuration cannot be used at the same time.\n"
@@ -848,8 +811,8 @@ private void handleHibernateORMWithNoPersistenceXml(
.filter(i -> i.isDefault())
.findFirst();
boolean enableDefaultPersistenceUnit = (defaultJdbcDataSource.isPresent()
- && hibernateOrmConfig.persistenceUnits.isEmpty())
- || hibernateOrmConfig.defaultPersistenceUnit.isAnyPropertySet();
+ && hibernateOrmConfig.namedPersistenceUnits().isEmpty())
+ || hibernateOrmConfig.defaultPersistenceUnit().isAnyPropertySet();
Map> modelClassesAndPackagesPerPersistencesUnits = getModelClassesAndPackagesPerPersistenceUnits(
hibernateOrmConfig, jpaModel, index.getIndex(), enableDefaultPersistenceUnit);
@@ -861,15 +824,15 @@ private void handleHibernateORMWithNoPersistenceXml(
if (enableDefaultPersistenceUnit) {
producePersistenceUnitDescriptorFromConfig(
hibernateOrmConfig, PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME,
- hibernateOrmConfig.defaultPersistenceUnit,
+ hibernateOrmConfig.defaultPersistenceUnit(),
modelClassesAndPackagesForDefaultPersistenceUnit,
jpaModel.getXmlMappings(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME),
jdbcDataSources, applicationArchivesBuildItem, launchMode, capabilities,
systemProperties, nativeImageResources, hotDeploymentWatchedFiles, persistenceUnitDescriptors,
storageEngineCollector, dbKindMetadataBuildItems);
} else if (!modelClassesAndPackagesForDefaultPersistenceUnit.isEmpty()
- && (!hibernateOrmConfig.defaultPersistenceUnit.datasource.isPresent()
- || DataSourceUtil.isDefault(hibernateOrmConfig.defaultPersistenceUnit.datasource.get()))
+ && (!hibernateOrmConfig.defaultPersistenceUnit().datasource().isPresent()
+ || DataSourceUtil.isDefault(hibernateOrmConfig.defaultPersistenceUnit().datasource().get()))
&& !defaultJdbcDataSource.isPresent()) {
String persistenceUnitName = PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME;
String dataSourceName = DataSourceUtil.DEFAULT_DATASOURCE_NAME;
@@ -877,7 +840,7 @@ private void handleHibernateORMWithNoPersistenceXml(
DataSourceUtil.dataSourceNotConfigured(dataSourceName));
}
- for (Entry persistenceUnitEntry : hibernateOrmConfig.persistenceUnits
+ for (Entry persistenceUnitEntry : hibernateOrmConfig.namedPersistenceUnits()
.entrySet()) {
producePersistenceUnitDescriptorFromConfig(
hibernateOrmConfig, persistenceUnitEntry.getKey(), persistenceUnitEntry.getValue(),
@@ -936,54 +899,55 @@ private static void producePersistenceUnitDescriptorFromConfig(
descriptor.setTransactionType(PersistenceUnitTransactionType.JTA);
- MultiTenancyStrategy multiTenancyStrategy = getMultiTenancyStrategy(persistenceUnitConfig.multitenant);
+ MultiTenancyStrategy multiTenancyStrategy = getMultiTenancyStrategy(persistenceUnitConfig.multitenant());
collectDialectConfig(persistenceUnitName, persistenceUnitConfig,
dbKindMetadataBuildItems, jdbcDataSource, multiTenancyStrategy,
systemProperties, descriptor.getProperties()::setProperty, storageEngineCollector);
// Physical Naming Strategy
- persistenceUnitConfig.physicalNamingStrategy.ifPresent(
+ persistenceUnitConfig.physicalNamingStrategy().ifPresent(
namingStrategy -> descriptor.getProperties()
.setProperty(AvailableSettings.PHYSICAL_NAMING_STRATEGY, namingStrategy));
// Implicit Naming Strategy
- persistenceUnitConfig.implicitNamingStrategy.ifPresent(
+ persistenceUnitConfig.implicitNamingStrategy().ifPresent(
namingStrategy -> descriptor.getProperties()
.setProperty(AvailableSettings.IMPLICIT_NAMING_STRATEGY, namingStrategy));
// Metadata builder contributor
- persistenceUnitConfig.metadataBuilderContributor.ifPresent(
+ persistenceUnitConfig.metadataBuilderContributor().ifPresent(
className -> descriptor.getProperties()
.setProperty(EntityManagerFactoryBuilderImpl.METADATA_BUILDER_CONTRIBUTOR, className));
// Mapping
- if (persistenceUnitConfig.mapping.timezone.timeZoneDefaultStorage.isPresent()) {
+ if (persistenceUnitConfig.mapping().timezone().timeZoneDefaultStorage().isPresent()) {
descriptor.getProperties().setProperty(AvailableSettings.TIMEZONE_DEFAULT_STORAGE,
- persistenceUnitConfig.mapping.timezone.timeZoneDefaultStorage.get().name());
+ persistenceUnitConfig.mapping().timezone().timeZoneDefaultStorage().get().name());
}
descriptor.getProperties().setProperty(AvailableSettings.PREFERRED_POOLED_OPTIMIZER,
- persistenceUnitConfig.mapping.id.optimizer.idOptimizerDefault
+ persistenceUnitConfig.mapping().id().optimizer().idOptimizerDefault()
.orElse(HibernateOrmConfigPersistenceUnit.IdOptimizerType.POOLED_LO).configName);
//charset
descriptor.getProperties().setProperty(AvailableSettings.HBM2DDL_CHARSET_NAME,
- persistenceUnitConfig.database.charset.name());
+ persistenceUnitConfig.database().charset().name());
// Quoting strategy
- if (persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ALL
- || persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS
- || persistenceUnitConfig.database.globallyQuotedIdentifiers) {
+ if (persistenceUnitConfig.quoteIdentifiers().strategy() == IdentifierQuotingStrategy.ALL
+ || persistenceUnitConfig.quoteIdentifiers()
+ .strategy() == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS
+ || persistenceUnitConfig.database().globallyQuotedIdentifiers()) {
descriptor.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, "true");
}
- if (persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS) {
+ if (persistenceUnitConfig.quoteIdentifiers().strategy() == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS) {
descriptor.getProperties().setProperty(
AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS_SKIP_COLUMN_DEFINITIONS, "true");
- } else if (persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ONLY_KEYWORDS) {
+ } else if (persistenceUnitConfig.quoteIdentifiers().strategy() == IdentifierQuotingStrategy.ONLY_KEYWORDS) {
descriptor.getProperties().setProperty(AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, "true");
}
// Query
- int batchSize = firstPresent(persistenceUnitConfig.fetch.batchSize, persistenceUnitConfig.batchFetchSize)
+ int batchSize = firstPresent(persistenceUnitConfig.fetch().batchSize(), persistenceUnitConfig.batchFetchSize())
.orElse(16);
if (batchSize > 0) {
descriptor.getProperties().setProperty(AvailableSettings.DEFAULT_BATCH_FETCH_SIZE,
@@ -991,49 +955,49 @@ private static void producePersistenceUnitDescriptorFromConfig(
descriptor.getProperties().setProperty(AvailableSettings.BATCH_FETCH_STYLE, BatchFetchStyle.PADDED.toString());
}
- if (persistenceUnitConfig.fetch.maxDepth.isPresent()) {
- setMaxFetchDepth(descriptor, persistenceUnitConfig.fetch.maxDepth);
- } else if (persistenceUnitConfig.maxFetchDepth.isPresent()) {
- setMaxFetchDepth(descriptor, persistenceUnitConfig.maxFetchDepth);
+ if (persistenceUnitConfig.fetch().maxDepth().isPresent()) {
+ setMaxFetchDepth(descriptor, persistenceUnitConfig.fetch().maxDepth());
+ } else if (persistenceUnitConfig.maxFetchDepth().isPresent()) {
+ setMaxFetchDepth(descriptor, persistenceUnitConfig.maxFetchDepth());
}
descriptor.getProperties().setProperty(AvailableSettings.QUERY_PLAN_CACHE_MAX_SIZE, Integer.toString(
- persistenceUnitConfig.query.queryPlanCacheMaxSize));
+ persistenceUnitConfig.query().queryPlanCacheMaxSize()));
descriptor.getProperties().setProperty(AvailableSettings.DEFAULT_NULL_ORDERING,
- persistenceUnitConfig.query.defaultNullOrdering.name().toLowerCase(Locale.ROOT));
+ persistenceUnitConfig.query().defaultNullOrdering().name().toLowerCase(Locale.ROOT));
descriptor.getProperties().setProperty(AvailableSettings.IN_CLAUSE_PARAMETER_PADDING,
- String.valueOf(persistenceUnitConfig.query.inClauseParameterPadding));
+ String.valueOf(persistenceUnitConfig.query().inClauseParameterPadding()));
// Disable sequence validations: they are reportedly slow, and people already get the same validation from normal schema validation
descriptor.getProperties().put(AvailableSettings.SEQUENCE_INCREMENT_SIZE_MISMATCH_STRATEGY,
SequenceMismatchStrategy.NONE);
// JDBC
- persistenceUnitConfig.jdbc.timezone.ifPresent(
+ persistenceUnitConfig.jdbc().timezone().ifPresent(
timezone -> descriptor.getProperties().setProperty(AvailableSettings.JDBC_TIME_ZONE, timezone));
- persistenceUnitConfig.jdbc.statementFetchSize.ifPresent(
+ persistenceUnitConfig.jdbc().statementFetchSize().ifPresent(
fetchSize -> descriptor.getProperties().setProperty(AvailableSettings.STATEMENT_FETCH_SIZE,
String.valueOf(fetchSize)));
- persistenceUnitConfig.jdbc.statementBatchSize.ifPresent(
+ persistenceUnitConfig.jdbc().statementBatchSize().ifPresent(
fetchSize -> descriptor.getProperties().setProperty(AvailableSettings.STATEMENT_BATCH_SIZE,
String.valueOf(fetchSize)));
// Statistics
- if (hibernateOrmConfig.metrics.enabled
- || (hibernateOrmConfig.statistics.isPresent() && hibernateOrmConfig.statistics.get())) {
+ if (hibernateOrmConfig.metrics().enabled()
+ || (hibernateOrmConfig.statistics().isPresent() && hibernateOrmConfig.statistics().get())) {
descriptor.getProperties().setProperty(AvailableSettings.GENERATE_STATISTICS, "true");
//When statistics are enabled, the default in Hibernate ORM is to also log them after each
// session; turn that off by default as it's very noisy:
descriptor.getProperties().setProperty(AvailableSettings.LOG_SESSION_METRICS,
- String.valueOf(hibernateOrmConfig.logSessionMetrics.orElse(false)));
+ String.valueOf(hibernateOrmConfig.logSessionMetrics().orElse(false)));
}
// sql-load-scripts
- List importFiles = getSqlLoadScript(persistenceUnitConfig.sqlLoadScript, launchMode);
+ List importFiles = getSqlLoadScript(persistenceUnitConfig.sqlLoadScript(), launchMode);
if (!importFiles.isEmpty()) {
for (String importFile : importFiles) {
@@ -1044,19 +1008,19 @@ private static void producePersistenceUnitDescriptorFromConfig(
throw new ConfigurationException(
"Unable to interpret path referenced in '"
+ HibernateOrmRuntimeConfig.puPropertyKey(persistenceUnitName, "sql-load-script") + "="
- + String.join(",", persistenceUnitConfig.sqlLoadScript.get())
+ + String.join(",", persistenceUnitConfig.sqlLoadScript().get())
+ "': " + e.getMessage());
}
if (loadScriptPath != null && !Files.isDirectory(loadScriptPath)) {
// enlist resource if present
nativeImageResources.produce(new NativeImageResourceBuildItem(importFile));
- } else if (persistenceUnitConfig.sqlLoadScript.isPresent()) {
+ } else if (persistenceUnitConfig.sqlLoadScript().isPresent()) {
//raise exception if explicit file is not present (i.e. not the default)
throw new ConfigurationException(
"Unable to find file referenced in '"
+ HibernateOrmRuntimeConfig.puPropertyKey(persistenceUnitName, "sql-load-script") + "="
- + String.join(",", persistenceUnitConfig.sqlLoadScript.get())
+ + String.join(",", persistenceUnitConfig.sqlLoadScript().get())
+ "'. Remove property or add file to your path.");
}
// in dev mode we want to make sure that we watch for changes to file even if it doesn't currently exist
@@ -1065,7 +1029,7 @@ private static void producePersistenceUnitDescriptorFromConfig(
}
// only set the found import files if configured
- if (persistenceUnitConfig.sqlLoadScript.isPresent()) {
+ if (persistenceUnitConfig.sqlLoadScript().isPresent()) {
descriptor.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, String.join(",", importFiles));
}
} else {
@@ -1074,7 +1038,7 @@ private static void producePersistenceUnitDescriptorFromConfig(
}
// Caching
- if (persistenceUnitConfig.secondLevelCachingEnabled) {
+ if (persistenceUnitConfig.secondLevelCachingEnabled()) {
Properties p = descriptor.getProperties();
//Only set these if the user isn't making an explicit choice:
p.putIfAbsent(USE_DIRECT_REFERENCE_CACHE_ENTRIES, Boolean.TRUE);
@@ -1097,7 +1061,7 @@ private static void producePersistenceUnitDescriptorFromConfig(
// Hibernate Validator integration: we force the callback mode to have bootstrap errors reported rather than validation ignored
// if there is any issue when bootstrapping Hibernate Validator.
if (capabilities.isPresent(Capability.HIBERNATE_VALIDATOR)) {
- if (persistenceUnitConfig.validation.enabled) {
+ if (persistenceUnitConfig.validation().enabled()) {
descriptor.getProperties().setProperty(AvailableSettings.JAKARTA_VALIDATION_MODE,
ValidationMode.CALLBACK.name());
} else {
@@ -1107,7 +1071,7 @@ private static void producePersistenceUnitDescriptorFromConfig(
// Discriminator Column
descriptor.getProperties().setProperty(AvailableSettings.IGNORE_EXPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
- String.valueOf(persistenceUnitConfig.discriminator.ignoreExplicitForJoined));
+ String.valueOf(persistenceUnitConfig.discriminator().ignoreExplicitForJoined()));
persistenceUnitDescriptors.produce(
new PersistenceUnitDescriptorBuildItem(descriptor,
@@ -1117,9 +1081,9 @@ private static void producePersistenceUnitDescriptorFromConfig(
jdbcDataSource.map(JdbcDataSourceBuildItem::getDbKind),
jdbcDataSource.flatMap(JdbcDataSourceBuildItem::getDbVersion),
multiTenancyStrategy,
- hibernateOrmConfig.database.ormCompatibilityVersion,
- persistenceUnitConfig.unsupportedProperties),
- persistenceUnitConfig.multitenantSchemaDatasource.orElse(null),
+ hibernateOrmConfig.database().ormCompatibilityVersion(),
+ persistenceUnitConfig.unsupportedProperties()),
+ persistenceUnitConfig.multitenantSchemaDatasource().orElse(null),
xmlMappings,
false, false, capabilities));
}
@@ -1130,7 +1094,7 @@ private static void collectDialectConfig(String persistenceUnitName,
MultiTenancyStrategy multiTenancyStrategy,
BuildProducer systemProperties,
BiConsumer puPropertiesCollector, Set storageEngineCollector) {
- Optional explicitDialect = persistenceUnitConfig.dialect.dialect;
+ Optional explicitDialect = persistenceUnitConfig.dialect().dialect();
Optional dbKind = jdbcDataSource.map(JdbcDataSourceBuildItem::getDbKind);
Optional explicitDbMinVersion = jdbcDataSource.flatMap(JdbcDataSourceBuildItem::getDbVersion);
if (multiTenancyStrategy != MultiTenancyStrategy.DATABASE && jdbcDataSource.isEmpty()) {
@@ -1182,14 +1146,14 @@ private static void collectDialectConfig(String persistenceUnitName,
persistenceUnitName));
}
- if (persistenceUnitConfig.dialect.storageEngine.isPresent()) {
+ if (persistenceUnitConfig.dialect().storageEngine().isPresent()) {
// Only actually set the storage engines if MySQL or MariaDB
if (isMySQLOrMariaDB(dialect.get())) {
// The storage engine has to be set as a system property.
// We record it so that we can later run checks (because we can only set a single value)
- storageEngineCollector.add(persistenceUnitConfig.dialect.storageEngine.get());
+ storageEngineCollector.add(persistenceUnitConfig.dialect().storageEngine().get());
systemProperties.produce(new SystemPropertyBuildItem(AvailableSettings.STORAGE_ENGINE,
- persistenceUnitConfig.dialect.storageEngine.get()));
+ persistenceUnitConfig.dialect().storageEngine().get()));
} else {
LOG.warnf("The storage engine set through configuration property '%1$s' is being ignored"
+ " because the database is neither MySQL nor MariaDB.",
@@ -1224,8 +1188,8 @@ private static void collectDialectConfigForPersistenceXml(String persistenceUnit
private static Optional findJdbcDataSource(String persistenceUnitName,
HibernateOrmConfigPersistenceUnit persistenceUnitConfig, List jdbcDataSources) {
- if (persistenceUnitConfig.datasource.isPresent()) {
- String dataSourceName = persistenceUnitConfig.datasource.get();
+ if (persistenceUnitConfig.datasource().isPresent()) {
+ String dataSourceName = persistenceUnitConfig.datasource().get();
return Optional.of(jdbcDataSources.stream()
.filter(i -> dataSourceName.equals(i.getName()))
.findFirst()
@@ -1293,22 +1257,23 @@ public static Map> getModelClassesAndPackagesPerPersistenceU
// handle the default persistence unit
if (enableDefaultPersistenceUnit) {
- if (!hibernateOrmConfig.defaultPersistenceUnit.packages.isPresent()) {
+ if (!hibernateOrmConfig.defaultPersistenceUnit().packages().isPresent()) {
throw new ConfigurationException("Packages must be configured for the default persistence unit.");
}
- for (String packageName : hibernateOrmConfig.defaultPersistenceUnit.packages.get()) {
+ for (String packageName : hibernateOrmConfig.defaultPersistenceUnit().packages().get()) {
packageRules.computeIfAbsent(normalizePackage(packageName), p -> new HashSet<>())
.add(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
}
}
// handle the named persistence units
- for (Entry candidatePersistenceUnitEntry : hibernateOrmConfig.persistenceUnits
+ for (Entry candidatePersistenceUnitEntry : hibernateOrmConfig
+ .namedPersistenceUnits()
.entrySet()) {
String candidatePersistenceUnitName = candidatePersistenceUnitEntry.getKey();
- Set candidatePersistenceUnitPackages = candidatePersistenceUnitEntry.getValue().packages
+ Set candidatePersistenceUnitPackages = candidatePersistenceUnitEntry.getValue().packages()
.orElseThrow(() -> new ConfigurationException(String.format(Locale.ROOT,
"Packages must be configured for persistence unit '%s'.", candidatePersistenceUnitName)));
@@ -1333,7 +1298,7 @@ public static Map> getModelClassesAndPackagesPerPersistenceU
.add(persistenceUnitName);
}
}
- } else if (!hibernateOrmConfig.persistenceUnits.isEmpty()) {
+ } else if (!hibernateOrmConfig.namedPersistenceUnits().isEmpty()) {
throw new ConfigurationException(
"Multiple persistence units are defined but the entities are not mapped to them. You should either use the .packages Quarkus configuration property or package-level @PersistenceUnit annotations.");
} else {
@@ -1439,9 +1404,9 @@ private static String normalizePackage(String pakkage) {
}
private static boolean hasPackagesInQuarkusConfig(HibernateOrmConfig hibernateOrmConfig) {
- for (HibernateOrmConfigPersistenceUnit persistenceUnitConfig : hibernateOrmConfig.getAllPersistenceUnitConfigsAsMap()
+ for (HibernateOrmConfigPersistenceUnit persistenceUnitConfig : hibernateOrmConfig.persistenceUnits()
.values()) {
- if (persistenceUnitConfig.packages.isPresent()) {
+ if (persistenceUnitConfig.packages().isPresent()) {
return true;
}
}
@@ -1480,7 +1445,7 @@ private static Collection getPackageLevelPersistenceUnitAnno
* @return true if we're expected to ignore them
*/
private boolean shouldIgnorePersistenceXmlResources(HibernateOrmConfig config) {
- return config.persistenceXml.ignore || Boolean.getBoolean("SKIP_PARSE_PERSISTENCE_XML");
+ return config.persistenceXml().ignore() || Boolean.getBoolean("SKIP_PARSE_PERSISTENCE_XML");
}
/**
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/dev/HibernateOrmDevServicesProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/dev/HibernateOrmDevServicesProcessor.java
index c47ba9e5666077..a6c15baddbba7d 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/dev/HibernateOrmDevServicesProcessor.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/dev/HibernateOrmDevServicesProcessor.java
@@ -36,9 +36,9 @@ void devServicesAutoGenerateByDefault(List s
Set managedSources = schemaReadyBuildItems.stream().map(JdbcDataSourceSchemaReadyBuildItem::getDatasourceNames)
.collect(HashSet::new, Collection::addAll, Collection::addAll);
- for (Map.Entry entry : config.getAllPersistenceUnitConfigsAsMap()
+ for (Map.Entry entry : config.persistenceUnits()
.entrySet()) {
- Optional dataSourceName = entry.getValue().datasource;
+ Optional dataSourceName = entry.getValue().datasource();
List propertyKeysIndicatingDataSourceConfigured = DataSourceUtil
.dataSourcePropertyKeys(dataSourceName.orElse(null), "username");
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetricsProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetricsProcessor.java
index 155c09b7e39573..d5567e1bca318c 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetricsProcessor.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetricsProcessor.java
@@ -33,7 +33,7 @@ public void metrics(HibernateOrmConfig config,
// IF Hibernate metrics and Hibernate statistics are enabled
// then define a consumer. It will only be invoked if metrics is enabled
- if (config.metrics.enabled && config.statistics.orElse(true) && metricsConfiguration.isPresent()) {
+ if (config.metrics().enabled() && config.statistics().orElse(true) && metricsConfiguration.isPresent()) {
datasourceMetrics.produce(new MetricsFactoryConsumerBuildItem(metricsRecorder.consumeMetricsFactory()));
}
}
diff --git a/extensions/hibernate-orm/deployment/src/main/resources/dev-ui/hibernate-orm-persistence-units.js b/extensions/hibernate-orm/deployment/src/main/resources/dev-ui/hibernate-orm-persistence-units.js
index f28762193739a8..0d6e245238ad13 100644
--- a/extensions/hibernate-orm/deployment/src/main/resources/dev-ui/hibernate-orm-persistence-units.js
+++ b/extensions/hibernate-orm/deployment/src/main/resources/dev-ui/hibernate-orm-persistence-units.js
@@ -5,16 +5,16 @@ import '@vaadin/button';
import '@vaadin/grid';
import { columnBodyRenderer } from '@vaadin/grid/lit.js';
import { notifier } from 'notifier';
+import { observeState } from 'lit-element-state';
+import { themeState } from 'theme-state';
+import '@quarkus-webcomponents/codeblock';
-export class HibernateOrmPersistenceUnitsComponent extends LitElement {
+export class HibernateOrmPersistenceUnitsComponent extends observeState(LitElement) {
static styles = css`
.full-height {
height: 100%;
}
- .ddl-script {
- padding: 5px;
- }
a.script-heading {
display: block;
float:left;
@@ -81,7 +81,11 @@ export class HibernateOrmPersistenceUnitsComponent extends LitElement {
- ${pu.createDDL}
+
+
@@ -96,7 +100,11 @@ export class HibernateOrmPersistenceUnitsComponent extends LitElement {
- ${pu.updateDDL}
+
+
@@ -111,13 +119,17 @@ export class HibernateOrmPersistenceUnitsComponent extends LitElement {
- ${pu.dropDDL}
+
+
`;
}
_copyToClipboard(event, what) {
event.stopPropagation();
- var text = event.target.closest("vaadin-details").querySelector(".ddl-script").textContent;
+ var text = event.target.closest("vaadin-details").querySelector("qui-code-block").value;
var listener = function(ev) {
ev.clipboardData.setData("text/plain", text);
ev.preventDefault();
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java
index d5f73061f69ad9..74b7d037bf1c07 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java
@@ -60,8 +60,12 @@ public void initData() throws Exception {
transaction.begin();
DefaultEntity entity = new DefaultEntity("default");
defaultSession.persist(entity);
+ transaction.commit();
+ transaction.begin();
User user = new User("user");
usersSession.persist(user);
+ transaction.commit();
+ transaction.begin();
Plane plane = new Plane("plane");
inventorySession.persist(plane);
transaction.commit();
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
index 86265c074ecc71..b73c006ce0e467 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
@@ -6,6 +6,7 @@
import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.transaction.Transactional;
+import jakarta.transaction.UserTransaction;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -39,26 +40,34 @@ public class MultiplePersistenceUnitsPackageAnnotationsTest {
@PersistenceUnit("inventory")
EntityManager inventoryEntityManager;
+ @Inject
+ UserTransaction transaction;
+
@Test
- @Transactional
- public void testDefault() {
+ public void testDefault() throws Exception {
+ transaction.begin();
SharedEntity defaultEntity = new SharedEntity("default");
defaultEntityManager.persist(defaultEntity);
SharedEntity savedDefaultEntity = defaultEntityManager.find(SharedEntity.class, defaultEntity.getId());
assertEquals(defaultEntity.getName(), savedDefaultEntity.getName());
+ transaction.commit();
+ transaction.begin();
SharedEntity defaultEntity2 = new SharedEntity("default2");
usersEntityManager.persist(defaultEntity2);
SharedEntity savedDefaultEntity2 = usersEntityManager.find(SharedEntity.class, defaultEntity2.getId());
assertEquals(defaultEntity2.getName(), savedDefaultEntity2.getName());
+ transaction.commit();
+ transaction.begin();
SharedEntity defaultEntity3 = new SharedEntity("default3");
inventoryEntityManager.persist(defaultEntity3);
SharedEntity savedDefaultEntity3 = inventoryEntityManager.find(SharedEntity.class, defaultEntity3.getId());
assertEquals(defaultEntity3.getName(), savedDefaultEntity3.getName());
+ transaction.commit();
}
@Test
@@ -75,7 +84,7 @@ public void testUser() {
OtherUserInSubPackage savedOtherUserInSubPackage = usersEntityManager.find(OtherUserInSubPackage.class,
otherUserInSubPackage.getId());
- assertEquals(savedOtherUserInSubPackage.getName(), savedOtherUserInSubPackage.getName());
+ assertEquals(otherUserInSubPackage.getName(), savedOtherUserInSubPackage.getName());
}
@Test
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
index d115d67dfb8424..52a5fafc14ea1f 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
@@ -58,7 +58,6 @@ public void testUserInInventoryEntityManager() {
}
@Test
- @Transactional
public void testAccessBothPersistenceUnits() {
testUser();
testPlane();
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
index b13741e7a94904..1d5e0ab49a7dc0 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
@@ -58,7 +58,6 @@ public void testUserInInventorySession() {
}
@Test
- @Transactional
public void testAccessBothPersistenceUnits() {
testUser();
testPlane();
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java
index f98ba87694899d..18fd28d86a15d2 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java
@@ -147,8 +147,6 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
throw new PersistenceException("No name provided and multiple persistence units found");
}
- Map puConfigMap = hibernateOrmRuntimeConfig
- .getAllPersistenceUnitConfigsAsMap();
for (RuntimePersistenceUnitDescriptor persistenceUnit : units) {
log.debugf(
"Checking persistence-unit [name=%s, explicit-provider=%s] against incoming persistence unit name [%s]",
@@ -174,9 +172,8 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
"Attempting to boot a blocking Hibernate ORM instance on a reactive RecordedState");
}
final PrevalidatedQuarkusMetadata metadata = recordedState.getMetadata();
- var puConfig = puConfigMap.getOrDefault(persistenceUnit.getConfigurationName(),
- new HibernateOrmRuntimeConfigPersistenceUnit());
- if (puConfig.active.isPresent() && !puConfig.active.get()) {
+ var puConfig = hibernateOrmRuntimeConfig.persistenceUnits().get(persistenceUnit.getConfigurationName());
+ if (puConfig.active().isPresent() && !puConfig.active().get()) {
throw new IllegalStateException(
"Attempting to boot a deactivated Hibernate ORM persistence unit");
}
@@ -228,7 +225,7 @@ private RuntimeSettings buildRuntimeSettings(String persistenceUnitName, Recorde
// Allow detection of driver/database capabilities on runtime init (was disabled during static init)
runtimeSettingsBuilder.put("hibernate.temp.use_jdbc_metadata_defaults", "true");
- if (!persistenceUnitConfig.unsupportedProperties.isEmpty()) {
+ if (!persistenceUnitConfig.unsupportedProperties().isEmpty()) {
log.warnf("Persistence-unit [%s] sets unsupported properties."
+ " These properties may not work correctly, and even if they do,"
+ " that may change when upgrading to a newer version of Quarkus (even just a micro/patch version)."
@@ -237,9 +234,9 @@ private RuntimeSettings buildRuntimeSettings(String persistenceUnitName, Recorde
+ " and more importantly so that the configuration property is tested regularly."
+ " Unsupported properties being set: %s",
persistenceUnitName,
- persistenceUnitConfig.unsupportedProperties.keySet());
+ persistenceUnitConfig.unsupportedProperties().keySet());
}
- for (Map.Entry entry : persistenceUnitConfig.unsupportedProperties.entrySet()) {
+ for (Map.Entry entry : persistenceUnitConfig.unsupportedProperties().entrySet()) {
var key = entry.getKey();
if (runtimeSettingsBuilder.get(key) != null) {
log.warnf("Persistence-unit [%s] sets property '%s' to a custom value through '%s',"
@@ -266,7 +263,7 @@ private RuntimeSettings buildRuntimeSettings(String persistenceUnitName, Recorde
persistenceUnitName,
HibernateOrmRuntimeConfig.puPropertyKey(persistenceUnitName, "database.orm-compatibility.version"),
databaseOrmCompatibilityVersion.externalRepresentation,
- persistenceUnitConfig.unsupportedProperties.keySet());
+ persistenceUnitConfig.unsupportedProperties().keySet());
}
for (Map.Entry entry : databaseOrmCompatibilitySettings.entrySet()) {
var key = entry.getKey();
@@ -403,12 +400,12 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
Builder runtimeSettingsBuilder) {
// Database
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
- persistenceUnitConfig.database.generation.generation);
+ persistenceUnitConfig.database().generation().generation());
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS,
- String.valueOf(persistenceUnitConfig.database.generation.createSchemas));
+ String.valueOf(persistenceUnitConfig.database().generation().createSchemas()));
- if (persistenceUnitConfig.database.generation.haltOnError) {
+ if (persistenceUnitConfig.database().generation().haltOnError()) {
runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true");
}
@@ -416,41 +413,41 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_SCRIPTS_CREATE_APPEND, "false");
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION,
- persistenceUnitConfig.scripts.generation.generation);
+ persistenceUnitConfig.scripts().generation().generation());
- if (persistenceUnitConfig.scripts.generation.createTarget.isPresent()) {
+ if (persistenceUnitConfig.scripts().generation().createTarget().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_SCRIPTS_CREATE_TARGET,
- persistenceUnitConfig.scripts.generation.createTarget.get());
+ persistenceUnitConfig.scripts().generation().createTarget().get());
}
- if (persistenceUnitConfig.scripts.generation.dropTarget.isPresent()) {
+ if (persistenceUnitConfig.scripts().generation().dropTarget().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_SCRIPTS_DROP_TARGET,
- persistenceUnitConfig.scripts.generation.dropTarget.get());
+ persistenceUnitConfig.scripts().generation().dropTarget().get());
}
- persistenceUnitConfig.database.defaultCatalog.ifPresent(
+ persistenceUnitConfig.database().defaultCatalog().ifPresent(
catalog -> runtimeSettingsBuilder.put(AvailableSettings.DEFAULT_CATALOG, catalog));
- persistenceUnitConfig.database.defaultSchema.ifPresent(
+ persistenceUnitConfig.database().defaultSchema().ifPresent(
schema -> runtimeSettingsBuilder.put(AvailableSettings.DEFAULT_SCHEMA, schema));
// Logging
- if (persistenceUnitConfig.log.sql) {
+ if (persistenceUnitConfig.log().sql()) {
runtimeSettingsBuilder.put(AvailableSettings.SHOW_SQL, "true");
- if (persistenceUnitConfig.log.formatSql) {
+ if (persistenceUnitConfig.log().formatSql()) {
runtimeSettingsBuilder.put(AvailableSettings.FORMAT_SQL, "true");
}
}
- if (persistenceUnitConfig.log.jdbcWarnings.isPresent()) {
+ if (persistenceUnitConfig.log().jdbcWarnings().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.LOG_JDBC_WARNINGS,
- persistenceUnitConfig.log.jdbcWarnings.get().toString());
+ persistenceUnitConfig.log().jdbcWarnings().get().toString());
}
- if (persistenceUnitConfig.log.queriesSlowerThanMs.isPresent()) {
+ if (persistenceUnitConfig.log().queriesSlowerThanMs().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.LOG_SLOW_QUERY,
- persistenceUnitConfig.log.queriesSlowerThanMs.get());
+ persistenceUnitConfig.log().queriesSlowerThanMs().get());
}
}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmDisabledRecorder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmDisabledRecorder.java
index a60b25ffc12160..0ada9c5da2c2a0 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmDisabledRecorder.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmDisabledRecorder.java
@@ -9,9 +9,9 @@
public class HibernateOrmDisabledRecorder {
public void checkNoExplicitActiveTrue(HibernateOrmRuntimeConfig runtimeConfig) {
- for (var entry : runtimeConfig.getAllPersistenceUnitConfigsAsMap().entrySet()) {
+ for (var entry : runtimeConfig.persistenceUnits().entrySet()) {
var config = entry.getValue();
- if (config.active.isPresent() && config.active.get()) {
+ if (config.active().isPresent() && config.active().get()) {
var puName = entry.getKey();
String enabledPropertyKey = HibernateOrmRuntimeConfig.extensionPropertyKey("enabled");
String activePropertyKey = HibernateOrmRuntimeConfig.puPropertyKey(puName, "active");
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfig.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfig.java
index 5392edca301b13..a7410b5a49a95a 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfig.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfig.java
@@ -1,53 +1,36 @@
package io.quarkus.hibernate.orm.runtime;
import java.util.Map;
-import java.util.TreeMap;
import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigPhase;
import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefaults;
+import io.smallrye.config.WithParentName;
+import io.smallrye.config.WithUnnamedKey;
+@ConfigMapping(prefix = "quarkus.hibernate-orm")
@ConfigRoot(phase = ConfigPhase.RUN_TIME)
-public class HibernateOrmRuntimeConfig {
+public interface HibernateOrmRuntimeConfig {
/**
- * Configuration for the default persistence unit.
+ * Configuration for persistence units.
*/
- @ConfigItem(name = ConfigItem.PARENT)
- public HibernateOrmRuntimeConfigPersistenceUnit defaultPersistenceUnit;
-
- /**
- * Additional named persistence units.
- */
- @ConfigDocSection
+ @WithParentName
+ @WithUnnamedKey(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME)
+ @WithDefaults
@ConfigDocMapKey("persistence-unit-name")
- @ConfigItem(name = ConfigItem.PARENT)
- public Map persistenceUnits;
+ Map persistenceUnits();
- public Map getAllPersistenceUnitConfigsAsMap() {
- Map map = new TreeMap<>();
- if (defaultPersistenceUnit != null) {
- map.put(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, defaultPersistenceUnit);
- }
- map.putAll(persistenceUnits);
- return map;
- }
-
- public static String extensionPropertyKey(String radical) {
+ static String extensionPropertyKey(String radical) {
return "quarkus.hibernate-orm." + radical;
}
- public static String puPropertyKey(String puName, String radical) {
+ static String puPropertyKey(String puName, String radical) {
String prefix = PersistenceUnitUtil.isDefaultPersistenceUnit(puName)
? "quarkus.hibernate-orm."
: "quarkus.hibernate-orm.\"" + puName + "\".";
return prefix + radical;
}
-
- public boolean isAnyPropertySet() {
- return defaultPersistenceUnit.isAnyPropertySet() ||
- !persistenceUnits.isEmpty();
- }
}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
index a272afe7f6cac6..15ff20cea6f625 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
@@ -1,18 +1,19 @@
package io.quarkus.hibernate.orm.runtime;
-import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import io.quarkus.runtime.annotations.ConfigDocDefault;
import io.quarkus.runtime.annotations.ConfigDocMapKey;
import io.quarkus.runtime.annotations.ConfigDocSection;
import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConvertWith;
import io.quarkus.runtime.configuration.TrimmedStringConverter;
+import io.smallrye.config.WithConverter;
+import io.smallrye.config.WithDefault;
+import io.smallrye.config.WithParentName;
@ConfigGroup
-public class HibernateOrmRuntimeConfigPersistenceUnit {
+public interface HibernateOrmRuntimeConfigPersistenceUnit {
/**
* Whether this persistence unit should be active at runtime.
@@ -28,29 +29,26 @@ public class HibernateOrmRuntimeConfigPersistenceUnit {
*
* @asciidoclet
*/
- @ConfigItem(defaultValueDocumentation = "'true' if Hibernate ORM is enabled; 'false' otherwise")
- public Optional active = Optional.empty();
+ @ConfigDocDefault("'true' if Hibernate ORM is enabled; 'false' otherwise")
+ Optional active();
/**
* Database related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitDatabase database = new HibernateOrmConfigPersistenceUnitDatabase();
+ HibernateOrmConfigPersistenceUnitDatabase database();
/**
* Database scripts related configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitScripts scripts = new HibernateOrmConfigPersistenceUnitScripts();
+ HibernateOrmConfigPersistenceUnitScripts scripts();
/**
* Logging configuration.
*/
- @ConfigItem
@ConfigDocSection
- public HibernateOrmConfigPersistenceUnitLog log = new HibernateOrmConfigPersistenceUnitLog();
+ HibernateOrmConfigPersistenceUnitLog log();
/**
* Properties that should be passed on directly to Hibernate ORM.
@@ -72,63 +70,43 @@ public class HibernateOrmRuntimeConfigPersistenceUnit {
*
* @asciidoclet
*/
- @ConfigItem
@ConfigDocMapKey("full-property-key")
- public Map unsupportedProperties = new HashMap<>();
-
- public boolean isAnyPropertySet() {
- return database.isAnyPropertySet() ||
- scripts.isAnyPropertySet() ||
- log.isAnyPropertySet() ||
- !unsupportedProperties.isEmpty();
- }
+ Map unsupportedProperties();
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitDatabase {
+ interface HibernateOrmConfigPersistenceUnitDatabase {
/**
* Schema generation configuration.
*/
- @ConfigItem
- public HibernateOrmConfigPersistenceUnitDatabaseGeneration generation = new HibernateOrmConfigPersistenceUnitDatabaseGeneration();
+ HibernateOrmConfigPersistenceUnitDatabaseGeneration generation();
/**
* The default catalog to use for the database objects.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional defaultCatalog = Optional.empty();
+ @WithConverter(TrimmedStringConverter.class)
+ Optional defaultCatalog();
/**
* The default schema to use for the database objects.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional defaultSchema = Optional.empty();
-
- public boolean isAnyPropertySet() {
- return generation.isAnyPropertySet()
- || defaultCatalog.isPresent()
- || defaultSchema.isPresent();
- }
+ @WithConverter(TrimmedStringConverter.class)
+ Optional defaultSchema();
+
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitScripts {
+ interface HibernateOrmConfigPersistenceUnitScripts {
/**
* Schema generation configuration.
*/
- @ConfigItem
- public HibernateOrmConfigPersistenceUnitScriptGeneration generation = new HibernateOrmConfigPersistenceUnitScriptGeneration();
+ HibernateOrmConfigPersistenceUnitScriptGeneration generation();
- public boolean isAnyPropertySet() {
- return generation.isAnyPropertySet();
- }
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitDatabaseGeneration {
+ interface HibernateOrmConfigPersistenceUnitDatabaseGeneration {
/**
* Select whether the database schema is generated or not.
@@ -140,94 +118,80 @@ public static class HibernateOrmConfigPersistenceUnitDatabaseGeneration {
*
* Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`.
*/
- @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none")
- @ConvertWith(TrimmedStringConverter.class)
- public String generation = "none";
+ @WithParentName
+ @WithDefault("none")
+ @WithConverter(TrimmedStringConverter.class)
+ String generation();
/**
* If Hibernate ORM should create the schemas automatically (for databases supporting them).
*/
- @ConfigItem
- public boolean createSchemas = false;
+ @WithDefault("false")
+ boolean createSchemas();
/**
* Whether we should stop on the first error when applying the schema.
*/
- @ConfigItem
- public boolean haltOnError = false;
-
- public boolean isAnyPropertySet() {
- return !"none".equals(generation)
- || createSchemas
- || haltOnError;
- }
+ @WithDefault("false")
+ boolean haltOnError();
+
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitScriptGeneration {
+ interface HibernateOrmConfigPersistenceUnitScriptGeneration {
/**
* Select whether the database schema DDL files are generated or not.
*
* Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`.
*/
- @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none")
- @ConvertWith(TrimmedStringConverter.class)
- public String generation = "none";
+ @WithParentName
+ @WithDefault("none")
+ @WithConverter(TrimmedStringConverter.class)
+ String generation();
/**
* Filename or URL where the database create DDL file should be generated.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional createTarget = Optional.empty();
+ @WithConverter(TrimmedStringConverter.class)
+ Optional createTarget();
/**
* Filename or URL where the database drop DDL file should be generated.
*/
- @ConfigItem
- @ConvertWith(TrimmedStringConverter.class)
- public Optional dropTarget = Optional.empty();
-
- public boolean isAnyPropertySet() {
- return !"none".equals(generation)
- || createTarget.isPresent()
- || dropTarget.isPresent();
- }
+ @WithConverter(TrimmedStringConverter.class)
+ Optional dropTarget();
+
}
@ConfigGroup
- public static class HibernateOrmConfigPersistenceUnitLog {
+ interface HibernateOrmConfigPersistenceUnitLog {
/**
* Show SQL logs and format them nicely.
*
* Setting it to true is obviously not recommended in production.
*/
- @ConfigItem
- public boolean sql = false;
+ @WithDefault("false")
+ boolean sql();
/**
* Format the SQL logs if SQL log is enabled
*/
- @ConfigItem(defaultValue = "true")
- public boolean formatSql = true;
+ @WithDefault("true")
+ boolean formatSql();
/**
* Whether JDBC warnings should be collected and logged.
*/
- @ConfigItem(defaultValueDocumentation = "depends on dialect")
- public Optional jdbcWarnings = Optional.empty();
+ @ConfigDocDefault("depends on dialect")
+ Optional jdbcWarnings();
/**
* If set, Hibernate will log queries that took more than specified number of milliseconds to execute.
*/
- @ConfigItem
- public Optional queriesSlowerThanMs = Optional.empty();
+ Optional queriesSlowerThanMs();
- public boolean isAnyPropertySet() {
- return sql || !formatSql || jdbcWarnings.isPresent() || queriesSlowerThanMs.isPresent();
- }
}
}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java
index f7c05f7530e446..5a47be2751500e 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java
@@ -29,13 +29,10 @@ public class JPAConfig {
@Inject
public JPAConfig(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig) {
- Map puConfigMap = hibernateOrmRuntimeConfig
- .getAllPersistenceUnitConfigsAsMap();
for (RuntimePersistenceUnitDescriptor descriptor : PersistenceUnitsHolder.getPersistenceUnitDescriptors()) {
String puName = descriptor.getName();
- var puConfig = puConfigMap.getOrDefault(descriptor.getConfigurationName(),
- new HibernateOrmRuntimeConfigPersistenceUnit());
- if (puConfig.active.isPresent() && !puConfig.active.get()) {
+ var puConfig = hibernateOrmRuntimeConfig.persistenceUnits().get(descriptor.getConfigurationName());
+ if (puConfig.active().isPresent() && !puConfig.active().get()) {
LOGGER.infof("Hibernate ORM persistence unit '%s' was deactivated through configuration properties",
puName);
deactivatedPersistenceUnitNames.add(puName);
diff --git a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveEnabled.java b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveEnabled.java
index b99f73e8ee4e8c..459f04197e42e9 100644
--- a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveEnabled.java
+++ b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveEnabled.java
@@ -24,7 +24,7 @@ public class HibernateReactiveEnabled implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
- return config.enabled;
+ return config.enabled();
}
}
diff --git a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java
index d8c2130bf24459..37303a0f579a1f 100644
--- a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java
+++ b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java
@@ -93,13 +93,19 @@ public final class HibernateReactiveProcessor {
void registerBeans(BuildProducer additionalBeans, CombinedIndexBuildItem combinedIndex,
List descriptors,
JpaModelBuildItem jpaModel) {
+ if (!hasEntities(jpaModel)) {
+ LOG.warnf("Skip registration of the %s bean - no JPA entities were found",
+ ReactiveSessionFactoryProducer.class.getSimpleName());
+ return;
+ }
if (descriptors.size() == 1) {
// Only register the bean if their EMF dependency is also available, so use the same guard as the ORM extension
additionalBeans.produce(new AdditionalBeanBuildItem(ReactiveSessionFactoryProducer.class));
} else {
- LOG.warnf(
- "Skipping registration of %s bean because exactly one persistence unit is required for their registration",
- ReactiveSessionFactoryProducer.class.getSimpleName());
+ throw new ConfigurationException(
+ "The Hibernate Reactive extension requires exactly one persistence unit configured: " + descriptors
+ .stream()
+ .map(PersistenceUnitDescriptorBuildItem::getPersistenceUnitName).collect(Collectors.toList()));
}
}
@@ -163,7 +169,7 @@ public void buildReactivePersistenceUnit(
DataSourceBuildTimeConfig defaultDataSourceBuildTimeConfig = dataSourcesBuildTimeConfig.dataSources()
.get(DataSourceUtil.DEFAULT_DATASOURCE_NAME);
- Optional explicitDialect = hibernateOrmConfig.defaultPersistenceUnit.dialect.dialect;
+ Optional explicitDialect = hibernateOrmConfig.defaultPersistenceUnit().dialect().dialect();
Optional explicitDbMinVersion = defaultDataSourceBuildTimeConfig.dbVersion();
Optional dbKindOptional = DefaultDataSourceDbKindBuildItem.resolve(
defaultDataSourceBuildTimeConfig.dbKind(),
@@ -172,8 +178,13 @@ public void buildReactivePersistenceUnit(
.orElse(!dataSourcesBuildTimeConfig.hasNamedDataSources()),
curateOutcomeBuildItem);
- if (dbKindOptional.isPresent()) {
- HibernateOrmConfigPersistenceUnit persistenceUnitConfig = hibernateOrmConfig.defaultPersistenceUnit;
+ if (dbKindOptional.isEmpty()) {
+ throw new ConfigurationException(
+ "The default datasource must be configured for Hibernate Reactive. Refer to https://quarkus.io/guides/datasource for guidance.",
+ Set.of("quarkus.datasource.db-kind", "quarkus.datasource.username",
+ "quarkus.datasource.password"));
+ } else {
+ HibernateOrmConfigPersistenceUnit persistenceUnitConfig = hibernateOrmConfig.defaultPersistenceUnit();
ParsedPersistenceXmlDescriptor reactivePU = generateReactivePersistenceUnit(
hibernateOrmConfig, index, persistenceUnitConfig, jpaModel,
dbKindOptional, explicitDialect, explicitDbMinVersion, applicationArchivesBuildItem,
@@ -189,8 +200,8 @@ public void buildReactivePersistenceUnit(
new RecordedConfig(Optional.of(DataSourceUtil.DEFAULT_DATASOURCE_NAME),
dbKindOptional, Optional.empty(),
io.quarkus.hibernate.orm.runtime.migration.MultiTenancyStrategy.NONE,
- hibernateOrmConfig.database.ormCompatibilityVersion,
- persistenceUnitConfig.unsupportedProperties),
+ hibernateOrmConfig.database().ormCompatibilityVersion(),
+ persistenceUnitConfig.unsupportedProperties()),
null,
jpaModel.getXmlMappings(reactivePU.getName()),
true, false, capabilities));
@@ -258,7 +269,7 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
desc.setTransactionType(PersistenceUnitTransactionType.RESOURCE_LOCAL);
setDialectAndStorageEngine(dbKindOptional, explicitDialect, explicitDbMinVersion, dbKindDialectBuildItems,
- persistenceUnitConfig.dialect.storageEngine, systemProperties, desc);
+ persistenceUnitConfig.dialect().storageEngine(), systemProperties, desc);
desc.setExcludeUnlistedClasses(true);
Map> modelClassesAndPackagesPerPersistencesUnits = HibernateOrmProcessor
@@ -282,44 +293,45 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
}
// Physical Naming Strategy
- persistenceUnitConfig.physicalNamingStrategy.ifPresent(
+ persistenceUnitConfig.physicalNamingStrategy().ifPresent(
namingStrategy -> desc.getProperties()
.setProperty(AvailableSettings.PHYSICAL_NAMING_STRATEGY, namingStrategy));
// Implicit Naming Strategy
- persistenceUnitConfig.implicitNamingStrategy.ifPresent(
+ persistenceUnitConfig.implicitNamingStrategy().ifPresent(
namingStrategy -> desc.getProperties()
.setProperty(AvailableSettings.IMPLICIT_NAMING_STRATEGY, namingStrategy));
// Mapping
- if (persistenceUnitConfig.mapping.timezone.timeZoneDefaultStorage.isPresent()) {
+ if (persistenceUnitConfig.mapping().timezone().timeZoneDefaultStorage().isPresent()) {
desc.getProperties().setProperty(AvailableSettings.TIMEZONE_DEFAULT_STORAGE,
- persistenceUnitConfig.mapping.timezone.timeZoneDefaultStorage.get().name());
+ persistenceUnitConfig.mapping().timezone().timeZoneDefaultStorage().get().name());
}
desc.getProperties().setProperty(AvailableSettings.PREFERRED_POOLED_OPTIMIZER,
- persistenceUnitConfig.mapping.id.optimizer.idOptimizerDefault
+ persistenceUnitConfig.mapping().id().optimizer().idOptimizerDefault()
.orElse(HibernateOrmConfigPersistenceUnit.IdOptimizerType.POOLED_LO).configName);
//charset
desc.getProperties().setProperty(AvailableSettings.HBM2DDL_CHARSET_NAME,
- persistenceUnitConfig.database.charset.name());
+ persistenceUnitConfig.database().charset().name());
// Quoting strategy
- if (persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ALL
- || persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS
- || persistenceUnitConfig.database.globallyQuotedIdentifiers) {
+ if (persistenceUnitConfig.quoteIdentifiers().strategy() == IdentifierQuotingStrategy.ALL
+ || persistenceUnitConfig.quoteIdentifiers()
+ .strategy() == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS
+ || persistenceUnitConfig.database().globallyQuotedIdentifiers()) {
desc.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, "true");
}
- if (persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS) {
+ if (persistenceUnitConfig.quoteIdentifiers().strategy() == IdentifierQuotingStrategy.ALL_EXCEPT_COLUMN_DEFINITIONS) {
desc.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS_SKIP_COLUMN_DEFINITIONS, "true");
- } else if (persistenceUnitConfig.quoteIdentifiers.strategy == IdentifierQuotingStrategy.ONLY_KEYWORDS) {
+ } else if (persistenceUnitConfig.quoteIdentifiers().strategy() == IdentifierQuotingStrategy.ONLY_KEYWORDS) {
desc.getProperties().setProperty(AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, "true");
}
// Query
// TODO ideally we should align on ORM and use 16 as a default, but that would break applications
// because of https://github.com/hibernate/hibernate-reactive/issues/742
- int batchSize = firstPresent(persistenceUnitConfig.fetch.batchSize, persistenceUnitConfig.batchFetchSize)
+ int batchSize = firstPresent(persistenceUnitConfig.fetch().batchSize(), persistenceUnitConfig.batchFetchSize())
.orElse(-1);
if (batchSize > 0) {
desc.getProperties().setProperty(AvailableSettings.DEFAULT_BATCH_FETCH_SIZE,
@@ -327,41 +339,41 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
desc.getProperties().setProperty(AvailableSettings.BATCH_FETCH_STYLE, BatchFetchStyle.PADDED.toString());
}
- if (persistenceUnitConfig.fetch.maxDepth.isPresent()) {
- setMaxFetchDepth(desc, persistenceUnitConfig.fetch.maxDepth);
- } else if (persistenceUnitConfig.maxFetchDepth.isPresent()) {
- setMaxFetchDepth(desc, persistenceUnitConfig.maxFetchDepth);
+ if (persistenceUnitConfig.fetch().maxDepth().isPresent()) {
+ setMaxFetchDepth(desc, persistenceUnitConfig.fetch().maxDepth());
+ } else if (persistenceUnitConfig.maxFetchDepth().isPresent()) {
+ setMaxFetchDepth(desc, persistenceUnitConfig.maxFetchDepth());
}
desc.getProperties().setProperty(AvailableSettings.QUERY_PLAN_CACHE_MAX_SIZE, Integer.toString(
- persistenceUnitConfig.query.queryPlanCacheMaxSize));
+ persistenceUnitConfig.query().queryPlanCacheMaxSize()));
desc.getProperties().setProperty(AvailableSettings.DEFAULT_NULL_ORDERING,
- persistenceUnitConfig.query.defaultNullOrdering.name().toLowerCase());
+ persistenceUnitConfig.query().defaultNullOrdering().name().toLowerCase());
desc.getProperties().setProperty(AvailableSettings.IN_CLAUSE_PARAMETER_PADDING,
- String.valueOf(persistenceUnitConfig.query.inClauseParameterPadding));
+ String.valueOf(persistenceUnitConfig.query().inClauseParameterPadding()));
// JDBC
- persistenceUnitConfig.jdbc.timezone.ifPresent(
+ persistenceUnitConfig.jdbc().timezone().ifPresent(
timezone -> desc.getProperties().setProperty(AvailableSettings.JDBC_TIME_ZONE, timezone));
- persistenceUnitConfig.jdbc.statementFetchSize.ifPresent(
+ persistenceUnitConfig.jdbc().statementFetchSize().ifPresent(
fetchSize -> desc.getProperties().setProperty(AvailableSettings.STATEMENT_FETCH_SIZE,
String.valueOf(fetchSize)));
- persistenceUnitConfig.jdbc.statementBatchSize.ifPresent(
+ persistenceUnitConfig.jdbc().statementBatchSize().ifPresent(
statementBatchSize -> desc.getProperties().setProperty(AvailableSettings.STATEMENT_BATCH_SIZE,
String.valueOf(statementBatchSize)));
// Statistics
- if (hibernateOrmConfig.metrics.enabled
- || (hibernateOrmConfig.statistics.isPresent() && hibernateOrmConfig.statistics.get())) {
+ if (hibernateOrmConfig.metrics().enabled()
+ || (hibernateOrmConfig.statistics().isPresent() && hibernateOrmConfig.statistics().get())) {
desc.getProperties().setProperty(AvailableSettings.GENERATE_STATISTICS, "true");
}
// sql-load-script
- List importFiles = getSqlLoadScript(persistenceUnitConfig.sqlLoadScript, launchMode);
+ List importFiles = getSqlLoadScript(persistenceUnitConfig.sqlLoadScript(), launchMode);
if (!importFiles.isEmpty()) {
for (String importFile : importFiles) {
@@ -371,19 +383,19 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
// enlist resource if present
nativeImageResources.produce(new NativeImageResourceBuildItem(importFile));
hotDeploymentWatchedFiles.produce(new HotDeploymentWatchedFileBuildItem(importFile));
- } else if (persistenceUnitConfig.sqlLoadScript.isPresent()) {
+ } else if (persistenceUnitConfig.sqlLoadScript().isPresent()) {
//raise exception if explicit file is not present (i.e. not the default)
String propertyName = HibernateOrmRuntimeConfig.puPropertyKey(persistenceUnitConfigName, "sql-load-script");
throw new ConfigurationException(
"Unable to find file referenced in '"
+ propertyName + "="
- + String.join(",", persistenceUnitConfig.sqlLoadScript.get())
+ + String.join(",", persistenceUnitConfig.sqlLoadScript().get())
+ "'. Remove property or add file to your path.",
Collections.singleton(propertyName));
}
}
- if (persistenceUnitConfig.sqlLoadScript.isPresent()) {
+ if (persistenceUnitConfig.sqlLoadScript().isPresent()) {
desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, String.join(",", importFiles));
}
} else {
@@ -392,7 +404,7 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
}
// Caching
- if (persistenceUnitConfig.secondLevelCachingEnabled) {
+ if (persistenceUnitConfig.secondLevelCachingEnabled()) {
Properties p = desc.getProperties();
//Only set these if the user isn't making an explicit choice:
p.putIfAbsent(USE_DIRECT_REFERENCE_CACHE_ENTRIES, Boolean.TRUE);
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java
index c4c11e2307d013..a70236bce167b0 100644
--- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java
@@ -1,9 +1,12 @@
package io.quarkus.hibernate.reactive.config.datasource;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import io.quarkus.hibernate.reactive.config.MyEntity;
+import io.quarkus.runtime.configuration.ConfigurationException;
import io.quarkus.test.QuarkusUnitTest;
public class EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest {
@@ -13,7 +16,11 @@ public class EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest {
.withApplicationRoot((jar) -> jar
.addClass(MyEntity.class))
.overrideConfigKey("quarkus.hibernate-orm.datasource", "ds-1")
- .overrideConfigKey("quarkus.hibernate-orm.database.generation", "drop-and-create");
+ .overrideConfigKey("quarkus.hibernate-orm.database.generation", "drop-and-create")
+ .assertException(t -> assertThat(t)
+ .isInstanceOf(ConfigurationException.class)
+ .hasMessageContaining(
+ "The default datasource must be configured for Hibernate Reactive. Refer to https://quarkus.io/guides/datasource for guidance."));
@Test
public void testInvalidConfiguration() {
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java
index 74f0f25029c80a..495a8b8dc4fc69 100644
--- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java
@@ -1,9 +1,12 @@
package io.quarkus.hibernate.reactive.config.datasource;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import io.quarkus.hibernate.reactive.config.MyEntity;
+import io.quarkus.runtime.configuration.ConfigurationException;
import io.quarkus.test.QuarkusUnitTest;
public class EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest {
@@ -13,7 +16,11 @@ public class EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest {
.withApplicationRoot((jar) -> jar
.addClass(MyEntity.class))
// The datasource won't be truly "unconfigured" if dev services are enabled
- .overrideConfigKey("quarkus.devservices.enabled", "false");
+ .overrideConfigKey("quarkus.devservices.enabled", "false")
+ .assertException(t -> assertThat(t)
+ .isInstanceOf(ConfigurationException.class)
+ .hasMessageContaining(
+ "The default datasource must be configured for Hibernate Reactive. Refer to https://quarkus.io/guides/datasource for guidance."));
@Test
public void testInvalidConfiguration() {
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java
index 5faa419621b96d..9fb08c246cd3fc 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java
@@ -118,8 +118,6 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
throw new PersistenceException("No name provided and multiple persistence units found");
}
- Map puConfigMap = hibernateOrmRuntimeConfig
- .getAllPersistenceUnitConfigsAsMap();
for (RuntimePersistenceUnitDescriptor persistenceUnit : units) {
log.debugf(
"Checking persistence-unit [name=%s, explicit-provider=%s] against incoming persistence unit name [%s]",
@@ -146,9 +144,8 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
RuntimeSettings.Builder runtimeSettingsBuilder = new RuntimeSettings.Builder(buildTimeSettings,
integrationSettings);
- var puConfig = puConfigMap.getOrDefault(persistenceUnit.getConfigurationName(),
- new HibernateOrmRuntimeConfigPersistenceUnit());
- if (puConfig.active.isPresent() && !puConfig.active.get()) {
+ var puConfig = hibernateOrmRuntimeConfig.persistenceUnits().get(persistenceUnit.getConfigurationName());
+ if (puConfig.active().isPresent() && !puConfig.active().get()) {
throw new IllegalStateException(
"Attempting to boot a deactivated Hibernate Reactive persistence unit");
}
@@ -166,7 +163,7 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
}
}
- if (!puConfig.unsupportedProperties.isEmpty()) {
+ if (!puConfig.unsupportedProperties().isEmpty()) {
log.warnf("Persistence-unit [%s] sets unsupported properties."
+ " These properties may not work correctly, and even if they do,"
+ " that may change when upgrading to a newer version of Quarkus (even just a micro/patch version)."
@@ -175,9 +172,9 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
+ " and more importantly so that the configuration property is tested regularly."
+ " Unsupported properties being set: %s",
persistenceUnitName,
- puConfig.unsupportedProperties.keySet());
+ puConfig.unsupportedProperties().keySet());
}
- for (Map.Entry entry : puConfig.unsupportedProperties.entrySet()) {
+ for (Map.Entry entry : puConfig.unsupportedProperties().entrySet()) {
var key = entry.getKey();
if (runtimeSettingsBuilder.get(key) != null) {
log.warnf("Persistence-unit [%s] sets property '%s' to a custom value through '%s',"
@@ -311,12 +308,12 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
Builder runtimeSettingsBuilder) {
// Database
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
- persistenceUnitConfig.database.generation.generation);
+ persistenceUnitConfig.database().generation().generation());
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS,
- String.valueOf(persistenceUnitConfig.database.generation.createSchemas));
+ String.valueOf(persistenceUnitConfig.database().generation().createSchemas()));
- if (persistenceUnitConfig.database.generation.haltOnError) {
+ if (persistenceUnitConfig.database().generation().haltOnError()) {
runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true");
}
@@ -324,41 +321,41 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_SCRIPTS_CREATE_APPEND, "false");
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION,
- persistenceUnitConfig.scripts.generation.generation);
+ persistenceUnitConfig.scripts().generation().generation());
- if (persistenceUnitConfig.scripts.generation.createTarget.isPresent()) {
+ if (persistenceUnitConfig.scripts().generation().createTarget().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET,
- persistenceUnitConfig.scripts.generation.createTarget.get());
+ persistenceUnitConfig.scripts().generation().createTarget().get());
}
- if (persistenceUnitConfig.scripts.generation.dropTarget.isPresent()) {
+ if (persistenceUnitConfig.scripts().generation().dropTarget().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET,
- persistenceUnitConfig.scripts.generation.dropTarget.get());
+ persistenceUnitConfig.scripts().generation().dropTarget().get());
}
- persistenceUnitConfig.database.defaultCatalog.ifPresent(
+ persistenceUnitConfig.database().defaultCatalog().ifPresent(
catalog -> runtimeSettingsBuilder.put(AvailableSettings.DEFAULT_CATALOG, catalog));
- persistenceUnitConfig.database.defaultSchema.ifPresent(
+ persistenceUnitConfig.database().defaultSchema().ifPresent(
schema -> runtimeSettingsBuilder.put(AvailableSettings.DEFAULT_SCHEMA, schema));
// Logging
- if (persistenceUnitConfig.log.sql) {
+ if (persistenceUnitConfig.log().sql()) {
runtimeSettingsBuilder.put(AvailableSettings.SHOW_SQL, "true");
- if (persistenceUnitConfig.log.formatSql) {
+ if (persistenceUnitConfig.log().formatSql()) {
runtimeSettingsBuilder.put(AvailableSettings.FORMAT_SQL, "true");
}
}
- if (persistenceUnitConfig.log.jdbcWarnings.isPresent()) {
+ if (persistenceUnitConfig.log().jdbcWarnings().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.LOG_JDBC_WARNINGS,
- persistenceUnitConfig.log.jdbcWarnings.get().toString());
+ persistenceUnitConfig.log().jdbcWarnings().get().toString());
}
- if (persistenceUnitConfig.log.queriesSlowerThanMs.isPresent()) {
+ if (persistenceUnitConfig.log().queriesSlowerThanMs().isPresent()) {
runtimeSettingsBuilder.put(AvailableSettings.LOG_SLOW_QUERY,
- persistenceUnitConfig.log.queriesSlowerThanMs.get());
+ persistenceUnitConfig.log().queriesSlowerThanMs().get());
}
}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties
index e83c72ada1bf42..8cadcad4a8d958 100644
--- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties
@@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.hibernate-search-orm.elasticsearch.version=8.9
+quarkus.hibernate-search-orm.elasticsearch.version=8.12
# Simulate an offline Elasticsearch instance by pointing to a non-existing cluster
quarkus.hibernate-search-orm.elasticsearch.hosts=localhost:14800
quarkus.hibernate-search-orm.schema-management.strategy=none
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/AbstractLocaleResolver.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/AbstractLocaleResolver.java
index 2c5674b07e85e8..d5d2f70d344fbd 100644
--- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/AbstractLocaleResolver.java
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/AbstractLocaleResolver.java
@@ -8,12 +8,17 @@
import org.hibernate.validator.spi.messageinterpolation.LocaleResolver;
import org.hibernate.validator.spi.messageinterpolation.LocaleResolverContext;
import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
abstract class AbstractLocaleResolver implements LocaleResolver {
private static final Logger log = Logger.getLogger(AbstractLocaleResolver.class);
private static final String ACCEPT_HEADER = "Accept-Language";
+ /**
+ * @return case-insensitive map
+ * @see CaseInsensitiveMap
+ */
protected abstract Map> getHeaders();
@Override
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java
index ff3565546883c8..7756a2f5476268 100644
--- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java
@@ -1,12 +1,13 @@
package io.quarkus.hibernate.validator.runtime.locale;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+
import io.quarkus.arc.Arc;
import io.quarkus.arc.ManagedContext;
import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
@@ -31,7 +32,7 @@ protected Map> getHeaders() {
}
RoutingContext current = currentVertxRequest.getCurrent();
if (current != null) {
- Map> result = new HashMap<>();
+ Map> result = new CaseInsensitiveMap();
MultiMap headers = current.request().headers();
for (String name : headers.names()) {
result.put(name, headers.getAll(name));
diff --git a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
index 7e11774606f90d..279d2f08467ba6 100644
--- a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
+++ b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
@@ -47,7 +47,6 @@
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.GeneratedSchema;
import org.infinispan.protostream.MessageMarshaller;
-import org.infinispan.protostream.RawProtobufMarshaller;
import org.infinispan.protostream.SerializationContextInitializer;
import org.infinispan.protostream.WrappedMessage;
import org.jboss.jandex.AnnotationInstance;
@@ -142,20 +141,7 @@ NativeImageFeatureBuildItem nativeImageFeature() {
@BuildStep
public void handleProtoStreamRequirements(BuildProducer protostreamPropertiesBuildItem)
throws ClassNotFoundException {
- // We only apply this if we are in native mode in build time to apply to the properties
- // Note that the other half is done in QuerySubstitutions.SubstituteMarshallerRegistration class
- // Note that the registration of these files are done twice in normal VM mode
- // (once during init and once at runtime)
Properties properties = new Properties();
- try {
- properties.put(PROTOBUF_FILE_PREFIX + WrappedMessage.PROTO_FILE,
- getContents("/" + WrappedMessage.PROTO_FILE));
- String queryProtoFile = "org/infinispan/query/remote/client/query.proto";
- properties.put(PROTOBUF_FILE_PREFIX + queryProtoFile, getContents("/" + queryProtoFile));
- } catch (Exception ex) {
- // Do nothing if fails
- }
-
Map marshallers = new HashMap<>();
initMarshaller(InfinispanClientUtil.DEFAULT_INFINISPAN_CLIENT_NAME,
infinispanClientsBuildTimeConfig.defaultInfinispanClient.marshallerClass, marshallers);
@@ -205,6 +191,8 @@ InfinispanPropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArch
additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(InfinispanClientName.class).build());
additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(Remote.class).build());
+ resourceBuildItem.produce(new NativeImageResourceBuildItem("proto/generated/query.proto"));
+ resourceBuildItem.produce(new NativeImageResourceBuildItem(WrappedMessage.PROTO_FILE));
hotDeployment
.produce(new HotDeploymentWatchedFileBuildItem(META_INF + File.separator + DEFAULT_HOTROD_CLIENT_PROPERTIES));
@@ -460,7 +448,7 @@ private void addMaxEntries(String clientName, InfinispanClientBuildTimeConfig co
@BuildStep
UnremovableBeanBuildItem ensureBeanLookupAvailable() {
return UnremovableBeanBuildItem.beanTypes(BaseMarshaller.class, EnumMarshaller.class, MessageMarshaller.class,
- RawProtobufMarshaller.class, FileDescriptorSource.class);
+ FileDescriptorSource.class);
}
@BuildStep
diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml
index a9ff61b97ae812..ad1a959e7ad57c 100644
--- a/extensions/infinispan-client/runtime/pom.xml
+++ b/extensions/infinispan-client/runtime/pom.xml
@@ -67,7 +67,7 @@