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

4.x: Update examples to use Config.global(config) #7655

Merged
merged 3 commits into from
Sep 25, 2023
Merged

4.x: Update examples to use Config.global(config) #7655

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e6baf3
Update examples to not use io.helidon.common.config and to explicital…
barchetta Sep 22, 2023
13d68e6
Use no-arg constructor for HttpService
barchetta Sep 22, 2023
2e512d1
Updates based on review comments
barchetta Sep 24, 2023
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
Prev Previous commit
Updates based on review comments
  • Loading branch information
@barchetta
barchetta committed Sep 24, 2023
commit 2e512d11f5f317ee61ea4b2160ce6e341000ad07
6 changes: 3 additions & 3 deletions examples/cors/src/main/java/io/helidon/examples/cors/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ public static void main(final String[] args) {
* @param routing routing builder
*/
static void routing(HttpRouting.Builder routing) {
Config config = Config.global();

// Note: Add the CORS routing *before* registering the GreetService routing.
routing.register("/greet", corsSupportForGreeting(config), new GreetService())
routing.register("/greet", corsSupportForGreeting(), new GreetService())
.addFeature(ObserveFeature.create());
}

private static CorsSupport corsSupportForGreeting(Config config) {
private static CorsSupport corsSupportForGreeting() {
Config config = Config.global();

// The default CorsSupport object (obtained using CorsSupport.create()) allows sharing for any HTTP method and with any
// origin. Using CorsSupport.create(Config) with a missing config node yields a default CorsSupport, which might not be
Expand Down
7 changes: 4 additions & 3 deletions ...les/metrics/filtering/se/src/main/java/io/helidon/examples/metrics/filtering/se/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,17 @@ static void setup(WebServerConfig.Builder server) {
.putScope(Meter.Scope.APPLICATION, scopeConfig));

server.config(config.get("server"))
.routing(r -> routing(r, config, metricsConfigBuilder));
.routing(r -> routing(r, metricsConfigBuilder));
}

/**
* Set up routing.
*
* @param routing routing builder
* @param config configuration of this server
*/
static void routing(HttpRouting.Builder routing, Config config, MetricsConfig.Builder metricsConfigBuilder) {
static void routing(HttpRouting.Builder routing, MetricsConfig.Builder metricsConfigBuilder) {
Config config = Config.global();

MeterRegistry meterRegistry = MetricsFactory.getInstance(config).globalRegistry();

MetricsObserver metrics = MetricsObserver.builder()
Expand Down