Skip to content

Commit 428b6aa

Browse files
committed
Sync documentation of main branch
1 parent b2a3473 commit 428b6aa

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

_versions/main/guides/getting-started-testing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@ An example use of this could be the following Maven command, that forces `@Quark
14311431
./mvnw verify -Dquarkus.http.test-host=1.2.3.4 -Dquarkus.http.test-port=4321
14321432
----
14331433

1434-
To test against a running instance that only accepts SSL/TLS connection (example: `https://1.2.3.4:4321`) set the system property `quarkus.http.test-ssl-enabled` to `true`.
1434+
To test against a running instance that only accepts SSL/TLS connection (example: `https://1.2.3.4:4321`) set the system property `quarkus.http.test-ssl-enabled` to `true` and `quarkus.http.test-ssl-port` to the target HTTPS port.
14351435

14361436
== Mixing `@QuarkusTest` with other type of tests
14371437

_versions/main/guides/qute-reference.adoc

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -399,28 +399,32 @@ NOTE: The current context can be accessed via the implicit binding `this`.
399399
|===
400400
|Name |Description |Examples
401401

402-
|Elvis Operator
402+
|Elvis Operator: `?:`
403403
|Outputs the default value if the previous part cannot be resolved or resolves to `null`.
404404
|`{person.name ?: 'John'}`, `{person.name or 'John'}`, `{person.name.or('John')}`
405405

406-
|orEmpty
406+
|`orEmpty`
407407
|Outputs an empty list if the previous part cannot be resolved or resolves to `null`.
408408
|`{pets.orEmpty.size}` outputs `0` if `pets` is not resolvable or `null`
409409

410-
|Ternary Operator
410+
|Ternary Operator: `condition ? ifTrue : ifFalse`
411411
|Shorthand for if-then-else statement. Unlike in <<if_section>> nested operators are not supported.
412412
|`{item.isActive ? item.name : 'Inactive item'}` outputs the value of `item.name` if `item.isActive` resolves to `true`.
413413

414-
|Logical AND Operator
414+
|Logical AND Operator: `&&`
415415
|Outputs `true` if both parts are not `falsy` as described in the <<if_section>>.
416416
The parameter is only evaluated if needed.
417417
|`{person.isActive && person.hasStyle}`
418418

419-
|Logical OR Operator
419+
|Logical OR Operator: `\|\|`
420420
|Outputs `true` if any of the parts is not `falsy` as described in the <<if_section>>.
421421
The parameter is only evaluated if needed.
422422
|`{person.isActive \|\| person.hasStyle}`
423423

424+
|Equals Operator: `==`/`eq`/`is`
425+
|Outputs `true` if the base object is equal to the argument.
426+
|`{obj1 is obj2 ? 'Equal' : 'Inequal'}`, `{obj1 == obj2 ? 'Equal' : 'Inequal'}`, `{obj1.eq(obj2) ? 'Equal' : 'Inequal'}`
427+
424428
|===
425429

426430
TIP: The condition in a ternary operator evaluates to `true` if the value is not considered `falsy` as described in <<if_section>>.
@@ -2263,22 +2267,23 @@ NOTE: Superfluous matching conditions are ignored. The conditions sorted by prio
22632267

22642268
An extension method may declare parameters.
22652269
If no namespace is specified then the first parameter that is not annotated with `@TemplateAttribute` is used to pass the base object, i.e. `org.acme.Item` in the first example.
2266-
If matching any name or using a regular expression, then a string method parameter needs to be used to pass the property name.
2270+
If matching any name or using a regular expression, then a string method parameter (not not annotated with `@TemplateAttribute`) needs to be used to pass the property name.
22672271
Parameters annotated with `@TemplateAttribute` are obtained via `TemplateInstance#getAttribute()`.
2268-
All other parameters are resolved when rendering the template and passed to the extension method.
2272+
All other parameters are treated as virtual method parameters and resolved when rendering the template and passed to the extension method.
22692273

22702274
.Multiple Parameters Example
22712275
[source,java]
22722276
----
22732277
@TemplateExtension
22742278
class BigDecimalExtensions {
22752279
2276-
static BigDecimal scale(BigDecimal val, int scale, RoundingMode mode) { <1>
2280+
@TemplateExtension(matchNames = {"scale", "setScale"})
2281+
static BigDecimal scale(BigDecimal val, String ignoredName, int scale, RoundingMode mode) { <1>
22772282
return val.setScale(scale, mode);
22782283
}
22792284
}
22802285
----
2281-
<1> This method matches an expression with base object of the type `BigDecimal.class`, with the `scale` virtual method name and two virtual method parameters.
2286+
<1> This method matches an expression with base object of the type `BigDecimal.class`, with the `scale()`/`setScale()` virtual method name and two virtual method parameters - `scale` and `mode`.
22822287

22832288
[source,html]
22842289
----

_versions/main/guides/rest.adoc

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,17 +2881,19 @@ However, you can change this default behavior and constrain a provider to:
28812881
=== Parameter mapping
28822882

28832883
All <<request-parameters,Request Parameters>> can be declared as link:{jdkapi}/java/lang/String.html[`String`],
2884-
but also any of the following types:
2884+
but also as any of the following types:
28852885

2886-
- Types for which a link:{jaxrsapi}/jakarta/ws/rs/ext/ParamConverter.html[`ParamConverter`] is available via a registered
2886+
1. Types for which a link:{jaxrsapi}/jakarta/ws/rs/ext/ParamConverter.html[`ParamConverter`] is available via a registered
28872887
link:{jaxrsapi}/jakarta/ws/rs/ext/ParamConverterProvider.html[`ParamConverterProvider`].
2888-
- Primitive types.
2889-
- Types that have a constructor that accepts a single link:{jdkapi}/java/lang/String.html[`String`] argument.
2890-
- Types that have a static method named `valueOf` or `fromString` with a single link:{jdkapi}/java/lang/String.html[`String`] argument
2888+
2. Primitive types.
2889+
3. Types that have a constructor that accepts a single link:{jdkapi}/java/lang/String.html[`String`] argument.
2890+
4. Types that have a static method named `valueOf` or `fromString` with a single link:{jdkapi}/java/lang/String.html[`String`] argument
28912891
that return an instance of the type. If both methods are present then `valueOf` will be used unless
28922892
the type is an `enum` in which case `fromString` will be used.
2893-
- link:{jdkapi}/java/util/List.html[`List<T>`], link:{jdkapi}/java/util/Set.html[`Set<T>`], or
2894-
link:{jdkapi}/java/util/SortedSet.html[`SortedSet<T>`], where `T` satisfies any above criterion.
2893+
5. link:{jdkapi}/java/util/List.html[`List<T>`], link:{jdkapi}/java/util/Set.html[`Set<T>`], or
2894+
link:{jdkapi}/java/util/SortedSet.html[`SortedSet<T>`], where `T` satisfies 1, 3 or 4 above.
2895+
2896+
For 3 and 4, constructor instantiation is prioritesed above method instantiation. Public, protected, and package private constructors and methods are supported for instantiation.
28952897

28962898
The following example illustrates all those possibilities:
28972899

_versions/main/guides/tls-registry-reference.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,8 @@ quarkus.tls.http.key-store.pem.0.key=tls.key
849849
[IMPORTANT]
850850
====
851851
Impacted servers and clients may need to listen to the `CertificateUpdatedEvent` to apply the new certificates.
852-
This is automatically done for the Quarkus HTTP server, such as the Quarkus REST server, gRPC server, and WebSocket server, as well as the management interface if it is enabled.
852+
This is automatically done for the Quarkus HTTP server, as well as the Quarkus REST server, gRPC server, and WebSocket server, as well as the management interface if it is enabled.
853+
On the client side, Quarkus REST Client automatically handles certificate update events.
853854
====
854855

855856
NOTE: In Quarkus dev mode, when files are touched, it will trigger the `CertificateUpdatedEvent` much more frequently.

0 commit comments

Comments
 (0)