Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc and JavaDoc fixes for #3747 and #3687. #3767

Merged
merged 1 commit into from
Jan 4, 2022
Merged

Doc and JavaDoc fixes for #3747 and #3687. #3767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/mp/testing/01_testing.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ This will change the behavior as follows:
In addition to the `@AddConfig` annotation, you can also use
`@Configuration` to configure additional classpath properties config sources using `configSources`, and to
mark that a custom configuration is desired.
If `@Configuration(useExisting=true)`, the existing (or default) MicroProfile configuration would be used. In this case
it is important to set property `mp.initializer.allow=true` in order CDI container to start, when used with
`@HelidonTest`.
You can set up config in `@BeforeAll` method and register it with `ConfigProviderResolver` using MP Config APIs, and declare
`@Configuration(useExisting=true)`.
Note that this is not compatible with repeatable tests that use method sources that access CDI, as we must delay the CDI
Expand Down
4 changes: 2 additions & 2 deletions docs/mp/tracing/01_tracing.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ include::{common-deps-page-prefix-inc}[tag=maven-dependency]
Tracing support is implemented for both for Helidon MP Server and for Jersey client.
In addition, you need to add one of the tracer implementations:

- <<tracing/02_zipkin.adoc,Zipkin>>
- <<tracing/03_jaeger.adoc,Jaeger>>
- <<mp/tracing/02_zipkin.adoc,Zipkin>>
- <<mp/tracing/03_jaeger.adoc,Jaeger>>

You can configure a custom service name using the `tracing.service` configuration property. If this
property is undefined, name is created from JAX-RS Application name, or `Helidon MP` is used if no application
Expand Down
4 changes: 3 additions & 1 deletion ...rofile/tests/junit5/src/main/java/io/helidon/microprofile/tests/junit5/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
@Inherited
public @interface Configuration {
/**
* If set to {@code true}, the existing (or default) MicroProfile configuration would be used.
* If set to {@code true}, the existing (or default) MicroProfile configuration would be used. In this case it is
* important to set property {@code mp.initializer.allow=true} in order CDI container to start, when used with
* {@link HelidonTest}.
* By default uses a configuration constructed using all {@link io.helidon.microprofile.tests.junit5.AddConfig}
* annotations and {@link #configSources()}.
* When set to false and a {@link org.junit.jupiter.api.BeforeAll} method registers a custom configuration
Expand Down