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.

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

Change CorsConfig.enabled to optional and add logic to infer it #8038

Merged
merged 1 commit into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/**
* Configuration of CORS feature.
*/
@Prototype.Blueprint
@Prototype.Blueprint(decorator = CorsConfigSupport.BuilderDecorator.class)
@Prototype.Configured(value = CorsFeature.CORS_ID, root = false)
@Prototype.Provides(ServerFeatureProvider.class)
interface CorsConfigBlueprint extends Prototype.Factory<CorsFeature> {
Expand Down Expand Up @@ -65,7 +65,7 @@ interface CorsConfigBlueprint extends Prototype.Factory<CorsFeature> {
* @return whether the feature is enabled
*/
@Option.Configured
@Option.DefaultBoolean(true)
@Option.Required
boolean enabled();

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (c) 2023 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.helidon.webserver.cors;

import java.util.Optional;

import io.helidon.builder.api.Prototype;
import io.helidon.common.config.Config;

class CorsConfigSupport {

static class BuilderDecorator implements Prototype.BuilderDecorator<CorsConfig.BuilderBase<?, ?>> {

@Override
public void decorate(CorsConfig.BuilderBase<?, ?> builder) {
// If enabled has been explicitly set (perhaps directly, perhaps by config) then use that value.
// Otherwise:
// If there is explicit CORS config then set enabled to true.
// Otherwise, set enabled to false.
if (builder.enabled().isPresent()) {
return;
}
Optional<Config> config = builder.config();
builder.enabled(config.isPresent() && config.get().exists());
}
}
}