Skip to content

Commit

Permalink
Application of the QE feedback to the Datasource guide
Browse files Browse the repository at this point in the history
Co-authored-by: Ladislav Thon <[email protected]>

Co-authored-by: Michelle Purcell <[email protected]>

Co-authored-by: Luis Barreiro <[email protected]>

Formatting

Signed-off-by: Michal Maléř <[email protected]>
  • Loading branch information
MichalMaler committed Sep 13, 2023
1 parent cd3dece commit 393d645
Show file tree
Hide file tree
Showing 8 changed files with 118 additions and 94 deletions.
65 changes: 40 additions & 25 deletions docs/src/main/asciidoc/datasource.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include::_attributes.adoc[]
:diataxis-type: reference
:categories: data,getting-started,reactive

Use a unified configuration model to define datasources for Java Database Connectivity (JDBC) and Reactive drivers.
Use a unified configuration model to define data sources for Java Database Connectivity (JDBC) and Reactive drivers.

////
Note for contributors and writers:
Expand All @@ -20,38 +20,36 @@ See, https://docs.oracle.com/javase/tutorial/jdbc/basics/connecting.html
Applications use datasources to access relational databases.
Quarkus provides a unified configuration model to define datasources for Java Database Connectivity (JDBC) and Reactive database drivers.

Quarkus uses link:https://agroal.github.io/[Agroal] and link:https://vertx.io/[Vert.x] to provide high-performance, scaleable data source connection pooling for JDBC and reactive drivers.
Quarkus uses link:https://agroal.github.io/[Agroal] and link:https://vertx.io/[Vert.x] to provide high-performance, scalable data source connection pooling for JDBC and reactive drivers.
The `jdbc-\*` and `reactive-*` extensions provide build time optimizations and integrate configured data sources with Quarkus features like security, health checks, and metrics.

For more information on consuming and using a reactive datasource, consult the Quarkus xref:reactive-sql-clients.adoc[Reactive SQL clients] guide.
For more information about consuming and using a reactive datasource, see the Quarkus xref:reactive-sql-clients.adoc[Reactive SQL clients] guide.

Check warning on line 26 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.TermsSuggestions] Depending on the context, consider using 'by using' or 'that uses' rather than 'using'. Raw Output: {"message": "[Quarkus.TermsSuggestions] Depending on the context, consider using 'by using' or 'that uses' rather than 'using'.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 26, "column": 41}}}, "severity": "INFO"}

Additionally, refer to the Quarkus xref:hibernate-orm.adoc[Hibernate ORM] guide for information on consuming and using a JDBC datasource.

Check warning on line 28 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.TermsWarnings] Consider using 'information about' rather than 'information on' unless updating existing content that uses the term. Raw Output: {"message": "[Quarkus.TermsWarnings] Consider using 'information about' rather than 'information on' unless updating existing content that uses the term.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 28, "column": 85}}}, "severity": "WARNING"}

Check warning on line 28 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.TermsSuggestions] Depending on the context, consider using 'by using' or 'that uses' rather than 'using'. Raw Output: {"message": "[Quarkus.TermsSuggestions] Depending on the context, consider using 'by using' or 'that uses' rather than 'using'.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 28, "column": 113}}}, "severity": "INFO"}


////
Future references to all other parts of this doc.
////

== Get started with configuring `datasources` in Quarkus

For rapid configuration of datasources, this section offers a brief overview and code samples for testing and utilization, suitable for users familiar with the fundamentals.

For more advanced configuration with examples, see xref:datasource-reference[Datasource references].
For more advanced configuration with examples, see <<datasource-reference>>.

Check warning on line 35 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.TermsSuggestions] Depending on the context, consider using 'because' or 'while' rather than 'as'. Raw Output: {"message": "[Quarkus.TermsSuggestions] Depending on the context, consider using 'because' or 'while' rather than 'as'.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 35, "column": 57}}}, "severity": "INFO"}

[[dev-services]]
=== Zero-config setup in development mode

Quarkus simplifies database configuration by offering the Dev Services feature, enabling zero-config database setup for testing or running in dev mode.
Quarkus simplifies database configuration by offering the Dev Services feature, enabling zero-config database setup for testing or running in development (dev) mode.
In dev mode, the suggested approach is to use DevServices and let Quarkus handle the database for you, whereas for production mode, you provide explicit database configuration details pointing to a database managed outside of Quarkus.

Check warning on line 41 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.SentenceLength] Try to keep sentences to an average of 32 words or fewer. Raw Output: {"message": "[Quarkus.SentenceLength] Try to keep sentences to an average of 32 words or fewer.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 41, "column": 1}}}, "severity": "INFO"}

Check warning on line 41 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.CaseSensitiveTerms] Use 'Dev Services' rather than 'DevServices'. Raw Output: {"message": "[Quarkus.CaseSensitiveTerms] Use 'Dev Services' rather than 'DevServices'.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 41, "column": 47}}}, "severity": "INFO"}

To use Dev Services, add the appropriate driver extension, such as `jdbc-postgresql`, for your desired database type to the `pom.xml` file.
In Dev mode, if you do not provide any explicit database connection details, Quarkus automatically handles the database setup and provides the wiring between the application and the database.
In dev mode, if you do not provide any explicit database connection details, Quarkus automatically handles the database setup and provides the wiring between the application and the database.

If you provide user credentials, the underlying database will be configured to use them.
This is useful if you want to connect to the database with an external tool.

To utilize this feature, ensure a Docker or Podman container runtime is installed, depending on the database type. Certain databases, such as H2, operate in in-memory mode and do not require a container runtime.

Check warning on line 49 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.TermsWarnings] Consider using 'use' rather than 'utilize' unless updating existing content that uses the term. Raw Output: {"message": "[Quarkus.TermsWarnings] Consider using 'use' rather than 'utilize' unless updating existing content that uses the term.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 49, "column": 4}}}, "severity": "WARNING"}

TIP: Prefix the actual connection details for Prod mode with `%prod.` to ensure they are not applied in Dev mode. For more information, see the xref:config-reference.adoc#profiles[Profiles] section of the xref:config-reference.adoc[Configuration reference] guide.
TIP: Prefix the actual connection details for prod mode with `%prod.` to ensure they are not applied in dev mode.
For more information, see the xref:config-reference.adoc#profiles[Profiles] section of the "Configuration reference" guide.

For more information about Dev Services, see xref:dev-services.adoc[Dev Services overview].

Expand Down Expand Up @@ -85,7 +83,17 @@ quarkus.datasource.jdbc.max-size=16
<1> This configuration value is only required if there is more than one database extension on the classpath.

If only one viable extension is available, Quarkus assumes this is the correct one.
If a driver has been added to the test scope, Quarkus automatically includes the driver in testing.
When you add a driver to the test scope, Quarkus automatically includes the specified driver in testing.

==== JDBC connection pool size adjustment

To protect your database from overloading during load peaks, size the pool adequately to throttle the database load.
The optimal pool size depends on many factors, such as the number of parallel application users or the nature of the workload.

Be aware that setting the pool size too low might cause some requests to time out while waiting for a connection.

For more information about pool size adjustment properties, see the <<jdbc-configuration>> section.


=== Configure a reactive datasource

Expand Down Expand Up @@ -175,7 +183,6 @@ JDBC is the most common database connection pattern, typically needed when used

.. For use with a built-in JDBC driver, choose and add the Quarkus extension for your relational database driver from the list below:
+

* Derby - `jdbc-derby`
* H2 - `jdbc-h2`
+
Expand Down Expand Up @@ -206,6 +213,7 @@ Using a built-in JDBC driver extension automatically includes the Agroal extensi
However, for custom drivers, Agroal needs to be added explicitly.

Check warning on line 213 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.Fluff] Depending on the context, consider using 'Rewrite the sentence, or use 'must', instead of' rather than 'needs to'. Raw Output: {"message": "[Quarkus.Fluff] Depending on the context, consider using 'Rewrite the sentence, or use 'must', instead of' rather than 'needs to'.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 213, "column": 37}}}, "severity": "INFO"}
====


.. For use with a custom JDBC driver, add the `quarkus-agroal` dependency to your project alongside the extension for your relational database driver:
+
[source,bash]
Expand Down Expand Up @@ -236,7 +244,8 @@ For more information about configuring JDBC, see <<jdbc-url,JDBC URL format refe
[[other-databases]]
===== Custom databases and drivers

If you need to connect to a database for which Quarkus does not provide an extension with the JDBC driver, you can use a custom driver instead. For example, if you are using the OpenTracing JDBC driver in your project.
If you need to connect to a database for which Quarkus does not provide an extension with the JDBC driver, you can use a custom driver instead.

Check warning on line 247 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.Fluff] Depending on the context, consider using 'Rewrite the sentence, or use 'must', instead of' rather than 'need to'. Raw Output: {"message": "[Quarkus.Fluff] Depending on the context, consider using 'Rewrite the sentence, or use 'must', instead of' rather than 'need to'.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 247, "column": 8}}}, "severity": "INFO"}

Check warning on line 247 in docs/src/main/asciidoc/datasource.adoc

View workflow job for this annotation

GitHub Actions / Linting with Vale

[vale] reported by reviewdog 🐶 [Quarkus.TermsSuggestions] Depending on the context, consider using ', which (non restrictive clause preceded by a comma)' or 'that (restrictive clause without a comma)' rather than 'which'. Raw Output: {"message": "[Quarkus.TermsSuggestions] Depending on the context, consider using ', which (non restrictive clause preceded by a comma)' or 'that (restrictive clause without a comma)' rather than 'which'.", "location": {"path": "docs/src/main/asciidoc/datasource.adoc", "range": {"start": {"line": 247, "column": 41}}}, "severity": "INFO"}
For example, if you are using the OpenTracing JDBC driver in your project.

Without an extension, the driver will work correctly in any Quarkus app running in JVM mode.
However, the driver is unlikely to work when compiling your application to a native executable.
Expand Down Expand Up @@ -278,11 +287,9 @@ AgroalDataSource defaultDataSource;
In the above example, the type is `AgroalDataSource`, a `javax.sql.DataSource` subtype.
Because of this, you can also use `javax.sql.DataSource` as the injected type.


==== Reactive datasource

Quarkus offers several reactive clients for a use with reactive datasource.

Quarkus offers several reactive clients for use with a reactive datasource.

. Add the corresponding extension to your application:
+
Expand All @@ -302,6 +309,16 @@ quarkus.datasource.reactive.url=postgresql:///your_database
quarkus.datasource.reactive.max-size=20
----

===== Reactive connection pool size adjustment

To protect your database from overloading during load peaks, size the pool adequately to throttle the database load.
The proper size always depends on many factors, such as the number of parallel application users or the nature of the workload.

Be aware that setting the pool size too low might cause some requests to time out while waiting for a connection.

For more information about pool size adjustment properties, see the <<reactive-configuration>> section.


==== JDBC and reactive datasources simultaneously

When a JDBC extension - along with Agroal - and a reactive datasource extension handling the given database kind are included, they will both be created by default.
Expand Down Expand Up @@ -421,15 +438,15 @@ Conversely, setting `quarkus.datasource.jdbc.enable-metrics` to `true`, or `quar
This can be useful if you need to access the collected metrics programmatically.
They are available after calling `dataSource.getMetrics()` on an injected `AgroalDataSource` instance.

If the metrics collection for this datasource is disabled, all values result to zero.
If the metrics collection for this datasource is disabled, all values result in zero.

=== Narayana transaction manager integration

Integration is automatic if the Narayana JTA extension is also available.

You can override this by setting the `transactions` configuration property:

* `quarkus.datasource.jdbc.transactions` for default unnamend datasource
* `quarkus.datasource.jdbc.transactions` for default unnamed datasource
* `quarkus.datasource._<datasource-name>_.jdbc.transactions` for named datasource

For more information, see the <<configuration-reference,Configuration reference>> section below.
Expand All @@ -450,19 +467,17 @@ Some databases like H2 and Derby are commonly used in the _embedded mode_ as a f
The recommended approach is to use the real database you intend to use in production, especially when xref:databases-dev-services.adoc[Dev Services provide a zero-config database for testing], and running tests against a container is relatively quick and produces expected results on an actual environment.
However, it is also possible to use JVM-powered databases for scenarios when the ability to run simple integration tests is required.

NOTE: While configuring Derby to use the embedded engine works as usual in JVM mode, such an application will not compile into a native executable. It is because Quarkus Derby extensions do not support embedding the entire database engine into a native executable, and it only covers making the JDBC client code compatible with the native compilation step.

==== Support and limitations

Embedded databases (H2 and Derby) work in JVM mode.
For native mode, the following limitations apply:

* Derby cannot be embedded into the application in native mode, and only remote connection is supported.
[IMPORTANT]
====
Embedding H2 within your native image is not recommended.
* Derby cannot be embedded into the application in native mode.
However, the Quarkus Derby extension allows native compilation of the Derby JDBC *client*, supporting *remote* connections.

* Embedding H2 within your native image is not recommended.
Consider using an alternative approach, for example, using a remote connection to a separate database instead.
====

==== Run an integration test

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ public interface DataSourceRuntimeConfig {
/**
* The credentials provider bean name.
* <p>
* It is the {@code &#64;Named} value of the credentials provider bean. It is used to discriminate if multiple
* CredentialsProvider beans are available.
* This is a bean name (as in {@code @Named}) of a bean that implements {@code CredentialsProvider}.
* It is used to select the credentials provider bean when multiple exist.
* This is unnecessary when there is only one credentials provider available.
* <p>
* For Vault it is: vault-credentials-provider. Not necessary if there is only one credentials provider available.
* For Vault, the credentials provider bean name is {@code vault-credentials-provider}.
*/
@WithConverter(TrimmedStringConverter.class)
Optional<String> credentialsProviderName();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public interface DataSourcesBuildTimeConfig {
Map<String, DataSourceBuildTimeConfig> dataSources();

/**
* Whether or not an health check is published in case the smallrye-health extension is present.
* Whether or not a health check is published in case the smallrye-health extension is present.
* <p>
* This is a global setting and is not specific to a datasource.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
public interface DevServicesBuildTimeConfig {

/**
* If DevServices has been explicitly enabled or disabled. DevServices is generally enabled
* by default, unless there is an existing configuration present.
* If DevServices has been explicitly enabled or disabled.
* DevServices is generally enabled by default unless an existing configuration is present.
*
* When DevServices is enabled Quarkus will attempt to automatically configure and start
* a database when running in Dev or Test mode.
* When DevServices is enabled, Quarkus will attempt to automatically configure and start a database when running in Dev or
* Test mode.
*/
Optional<Boolean> enabled();

/**
* The container image name to use, for container based DevServices providers.
* The container image name for container-based DevServices providers.
*
* If the provider is not container based (e.g. a H2 Database) then this has no effect.
* This has no effect if the provider is not a container-based database, such as H2 or Derby.
*/
Optional<String> imageName();

Expand All @@ -33,8 +33,8 @@ public interface DevServicesBuildTimeConfig {
/**
* Generic properties that are passed for additional container configuration.
* <p>
* Properties defined here are database specific and are interpreted specifically in each database dev service
* implementation.
* Properties defined here are database-specific
* and are interpreted specifically in each database dev service implementation.
*/
Map<String, String> containerProperties();

Expand All @@ -51,14 +51,14 @@ public interface DevServicesBuildTimeConfig {
OptionalInt port();

/**
* The container start command to use, for container based DevServices providers.
* The container start command to use for container-based DevServices providers.
*
* If the provider is not container based (e.g. a H2 Database) then this has no effect.
* This has no effect if the provider is not a container-based database, such as H2 or Derby.
*/
Optional<String> command();

/**
* The name of the database to use if this Dev Service supports overriding it.
* The database name to use if this Dev Service supports overriding it.
*/
Optional<String> dbName();

Expand All @@ -73,21 +73,22 @@ public interface DevServicesBuildTimeConfig {
Optional<String> password();

/**
* Path to a SQL script that will be loaded from the classpath and applied to the Dev Service database
* The path to a SQL script to be loaded from the classpath and applied to the Dev Service database.
*
* If the provider is not container based (e.g. an H2 or Derby Database) then this has no effect.
* This has no effect if the provider is not a container-based database, such as H2 or Derby.
*/
Optional<String> initScriptPath();

/**
* The volumes to be mapped to the container. The map key corresponds to the host location and the map value is the
* container location. If the host location starts with "classpath:", then the mapping will load the resource from the
* classpath with read-only permission.
* The volumes to be mapped to the container.
* The map key corresponds to the host location; the map value is the container location.
* If the host location starts with "classpath:",
* the mapping loads the resource from the classpath with read-only permission.
*
* When using a file system location, the volume will be created with read-write permission, so the data in your file
* system might be wiped out or altered.
* When using a file system location, the volume will be generated with read-write permission,
* potentially leading to data loss or modification in your file system.
*
* If the provider is not container based (e.g. an H2 or Derby Database) then this has no effect.
* This has no effect if the provider is not a container-based database, such as H2 or Derby.
*/
Map<String, String> volumes();
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class InfinispanClientsBuildTimeConfig {
public Map<String, InfinispanClientBuildTimeConfig> namedInfinispanClients;

/**
* Whether or not an health check is published in case the smallrye-health extension is present.
* Whether or not a health check is published in case the smallrye-health extension is present.
* <p>
* This is a global setting and is not specific to an Infinispan Client.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public class CredentialConfig {

/**
* Configures the source of the authentication credentials.
* This is typically the database that the credentials have been created. The value defaults to the database
* This is typically the database where the credentials have been created.
* The value defaults to the database
* specified in the path portion of the connection string or in the 'database' configuration property.
* If the database is specified in neither place, the default value is {@code admin}. This option is only
* respected when using the MONGO-CR mechanism (the default).
Expand All @@ -61,10 +62,11 @@ public class CredentialConfig {
/**
* The credentials provider bean name.
* <p>
* It is the {@code &#64;Named} value of the credentials provider bean. It is used to discriminate if multiple
* CredentialsProvider beans are available.
* This is a bean name (as in {@code @Named}) of a bean that implements {@code CredentialsProvider}.
* It is used to select the credentials provider bean when multiple exist.
* This is unnecessary when there is only one credentials provider available.
* <p>
* For Vault it is: vault-credentials-provider. Not necessary if there is only one credentials provider available.
* For Vault, the credentials provider bean name is {@code vault-credentials-provider}.
*/
@ConfigItem
@ConvertWith(TrimmedStringConverter.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
public class RabbitMQBuildTimeConfig {

/**
* Configuration for DevServices. DevServices allows Quarkus to automatically start a RabbitMQ broker in dev and test mode.
* Configuration for DevServices.
* DevServices allows Quarkus to start a RabbitMQ broker in dev and test mode automatically.
*/
@ConfigItem
public RabbitMQDevServicesBuildTimeConfig devservices;
Expand All @@ -24,10 +25,11 @@ public class RabbitMQBuildTimeConfig {
/**
* The credentials provider bean name.
* <p>
* It is the {@code &#64;Named} value of the credentials provider bean. It is used to discriminate if multiple
* CredentialsProvider beans are available.
* This is a bean name (as in {@code @Named}) of a bean that implements {@code CredentialsProvider}.
* It is used to select the credentials provider bean when multiple exist.
* This is unnecessary when there is only one credentials provider available.
* <p>
* For Vault it is: vault-credentials-provider. Not necessary if there is only one credentials provider available.
* For Vault, the credentials provider bean name is {@code vault-credentials-provider}.
*/
@ConfigItem
public Optional<String> credentialsProviderName = Optional.empty();
Expand Down
Loading

0 comments on commit 393d645

Please sign in to comment.