Skip to content

Commit

Permalink
Change CorsConfig.enabled to optional and add logic to infer it (#8038)
Browse files Browse the repository at this point in the history
  • Loading branch information
tjquinno authored Nov 20, 2023
1 parent e923b0a commit 0be52f6
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 2 deletions.
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());
}
}
}

0 comments on commit 0be52f6

Please sign in to comment.