From 99320436f11138848761decac9bdfa3920a6e20b Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Thu, 18 Jan 2024 08:30:49 -0800 Subject: [PATCH 1/2] Docs: change WebServer.Builder to WebServerConfig.Builder. --- docs/src/main/asciidoc/se/guides/health.adoc | 2 +- docs/src/main/asciidoc/se/testing.adoc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/se/guides/health.adoc b/docs/src/main/asciidoc/se/guides/health.adoc index 82df96fe9da..0d1e659e760 100644 --- a/docs/src/main/asciidoc/se/guides/health.adoc +++ b/docs/src/main/asciidoc/se/guides/health.adoc @@ -176,7 +176,7 @@ You can add your own custom health checks. These typically assess the conditions The following trivial but illustrative example adds a custom start-up check that reports `DOWN` until the server has been running for eight seconds and reports `UP` thereafter. Note the two main steps in the example code: 1. Create an explicit instance of `ObserveFeature` which contains a custom `HealthObserver` with the custom check. -2. Add that `ObserveFeature` instance to the `WebServer.Builder` as a feature. +2. Add that `ObserveFeature` instance to the `WebServerConfig.Builder` as a feature. [source,java] diff --git a/docs/src/main/asciidoc/se/testing.adoc b/docs/src/main/asciidoc/se/testing.adoc index db7f71379bb..8bc1f5dfb5e 100644 --- a/docs/src/main/asciidoc/se/testing.adoc +++ b/docs/src/main/asciidoc/se/testing.adoc @@ -24,6 +24,8 @@ :feature-name: Helidon Testing Framework :rootdir: {docdir}/.. +include::{rootdir}/includes/se.adoc[] + == Contents - <> @@ -98,7 +100,7 @@ and may have any name. The `@SetUpRoute` annotation has `value` with socket name |=== -In addition, a static method annotated with `@SetUpServer` can be defined for `@ServerTest`, which has a single parameter of `WebServer.Builder`. +In addition, a static method annotated with `@SetUpServer` can be defined for `@ServerTest`, which has a single parameter of link:{javadoc-base-url}/io.helidon.webserver/io/helidon/webserver/WebServerConfig.Builder.html[`WebServerConfig.Builder`]. The following table lists the injectable types (through constructor or method injection). From 6a8a89c9906800739d4cb7e894c6d755559d81c0 Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Thu, 18 Jan 2024 08:35:11 -0800 Subject: [PATCH 2/2] Fix copyright --- docs/src/main/asciidoc/se/guides/health.adoc | 2 +- docs/src/main/asciidoc/se/testing.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/se/guides/health.adoc b/docs/src/main/asciidoc/se/guides/health.adoc index 0d1e659e760..ad0bfe02977 100644 --- a/docs/src/main/asciidoc/se/guides/health.adoc +++ b/docs/src/main/asciidoc/se/guides/health.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2019, 2023 Oracle and/or its affiliates. + Copyright (c) 2019, 2024 Oracle and/or its affiliates. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/docs/src/main/asciidoc/se/testing.adoc b/docs/src/main/asciidoc/se/testing.adoc index 8bc1f5dfb5e..c1d89f807c2 100644 --- a/docs/src/main/asciidoc/se/testing.adoc +++ b/docs/src/main/asciidoc/se/testing.adoc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// - Copyright (c) 2023 Oracle and/or its affiliates. + Copyright (c) 2023, 2024 Oracle and/or its affiliates. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.