-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #26569 from gsmet/2.10.2-backports-2
2.10.2 backports 2
- Loading branch information
Showing
16 changed files
with
230 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -650,3 +650,93 @@ include::{generated-dir}/config/quarkus-reactive-oracle-client.adoc[opts=optiona | |
| === Reactive PostgreSQL Specific Configuration | ||
|
|
||
| include::{generated-dir}/config/quarkus-reactive-pg-client.adoc[opts=optional, leveloffset=+1] | ||
|
|
||
|
|
||
| [[reactive-url]] | ||
| == Reactive Datasource URL Reference | ||
|
|
||
| === DB2 | ||
|
|
||
| `db2://[user[:[password]]@]host[:port][/database][?<key1>=<value1>[&<key2>=<value2>]]` | ||
|
|
||
| Example:: `db2://dbuser:[email protected]:50000/mydb` | ||
|
|
||
| Currently, the client supports the following parameter keys: | ||
|
|
||
| * `host` | ||
| * `port` | ||
| * `user` | ||
| * `password` | ||
| * `database` | ||
|
|
||
| NOTE: Configuring parameters in connection URL will override the default properties. | ||
|
|
||
| === Microsoft SQL Server | ||
|
|
||
| `sqlserver://[user[:[password]]@]host[:port][/database][?<key1>=<value1>[&<key2>=<value2>]]` | ||
|
|
||
| Example:: `sqlserver://dbuser:[email protected]:1433/mydb` | ||
|
|
||
| Currently, the client supports the following parameter keys: | ||
|
|
||
| * `host` | ||
| * `port` | ||
| * `user` | ||
| * `password` | ||
| * `database` | ||
|
|
||
| NOTE: Configuring parameters in connection URL will override the default properties. | ||
|
|
||
| === MySQL / MariaDB | ||
|
|
||
| `mysql://[user[:[password]]@]host[:port][/database][?<key1>=<value1>[&<key2>=<value2>]]` | ||
|
|
||
| Example:: `mysql://dbuser:[email protected]:3211/mydb` | ||
|
|
||
| Currently, the client supports the following parameter keys (case-insensitive): | ||
|
|
||
| * `host` | ||
| * `port` | ||
| * `user` | ||
| * `password` | ||
| * `schema` | ||
| * `socket` | ||
| * `useAffectedRows` | ||
|
|
||
| NOTE: Configuring parameters in connection URL will override the default properties. | ||
|
|
||
| === Oracle | ||
|
|
||
| ==== EZConnect Format | ||
|
|
||
| `oracle:thin:@[[protocol:]//]host[:port][/service_name][:server_mode][/instance_name][?connection properties]` | ||
|
|
||
| Example:: `oracle:thin:@mydbhost1:5521/mydbservice?connect_timeout=10sec` | ||
|
|
||
| ==== TNS Alias Format | ||
|
|
||
| `oracle:thin:@<alias_name>[?connection properties]` | ||
|
|
||
| Example:: `oracle:thin:@prod_db?TNS_ADMIN=/work/tns/` | ||
|
|
||
| === PostgreSQL | ||
|
|
||
| `postgresql://[user[:[password]]@]host[:port][/database][?<key1>=<value1>[&<key2>=<value2>]]` | ||
|
|
||
| Example:: `postgresql://dbuser:[email protected]:5432/mydb` | ||
|
|
||
| Currently, the client supports the following parameter keys: | ||
|
|
||
| * `host` | ||
| * `port` | ||
| * `user` | ||
| * `password` | ||
| * `dbname` | ||
| * `sslmode` | ||
| * additional properties, including: | ||
| ** `application_name` | ||
| ** `fallback_application_name` | ||
| ** `search_path` | ||
| ** `options` | ||
|
|
||
| NOTE: Configuring parameters in connection URL will override the default properties. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
...ain/java/io/quarkus/kubernetes/deployment/PreventImplicitContainerImagePushBuildItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package io.quarkus.kubernetes.deployment; | ||
|
|
||
| import io.quarkus.builder.item.MultiBuildItem; | ||
|
|
||
| /** | ||
| * A build item that is used to prevent the Kubernetes processing from requesting | ||
| * a container image push request. | ||
| * This is useful for cases where the kubernetes cluster is local and the container image | ||
| * is built directly into a context (i.e. a docker daemon) which the cluster has access to. | ||
| */ | ||
| public final class PreventImplicitContainerImagePushBuildItem extends MultiBuildItem { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...sy/reactive/server/test/customexceptions/SecurityExceptionMapperWithResourceInfoTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package io.quarkus.resteasy.reactive.server.test.customexceptions; | ||
|
|
||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| import javax.annotation.security.DenyAll; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.container.ResourceInfo; | ||
| import javax.ws.rs.core.Response; | ||
|
|
||
| import org.jboss.resteasy.reactive.server.ServerExceptionMapper; | ||
| import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
| 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 io.restassured.RestAssured; | ||
|
|
||
| public class SecurityExceptionMapperWithResourceInfoTest { | ||
|
|
||
| @RegisterExtension | ||
| static QuarkusUnitTest test = new QuarkusUnitTest() | ||
| .setArchiveProducer(new Supplier<>() { | ||
| @Override | ||
| public JavaArchive get() { | ||
| return ShrinkWrap.create(JavaArchive.class) | ||
| .addClasses(Resource.class); | ||
| } | ||
| }); | ||
|
|
||
| @Test | ||
| void test() { | ||
| RestAssured.get("/test/denied") | ||
| .then().statusCode(403).body(is(Resource.class.getName())); | ||
| } | ||
|
|
||
| @Path("test") | ||
| public static class Resource { | ||
| @GET | ||
| @Path("denied") | ||
| @Produces("text/plain") | ||
| @DenyAll | ||
| public String denied() { | ||
| return "denied"; | ||
| } | ||
|
|
||
| @ServerExceptionMapper(SecurityException.class) | ||
| Response handle(SecurityException t, ResourceInfo resourceInfo) { | ||
| return Response.status(403).entity(resourceInfo.getResourceClass().getName()).build(); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.