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

extract prefix #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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 @@ -33,15 +33,15 @@ public class DefaultSnitchFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultSnitchFactory.class);

@EachBean(SnitchJobConfiguration.class)
@Requires(property = "snitches.jobs")
@Requires(property = SnitchConfiguration.PREFIX + ".jobs")
public SnitchService snitchService(SnitchClient client, SnitchJobConfiguration configuration) {
return new DefaultSnitchService(client, configuration);
}

@Bean
@Singleton
@Named("default")
@Requires(property = "snitches.id")
@Requires(property = SnitchConfiguration.PREFIX + ".id")
public SnitchService defaultSnitchService(SnitchClient client, @Value("${snitches.id}") String id) {
SnitchJobConfiguration configuration = new SnitchJobConfiguration("default");
configuration.setId(id);
Expand All @@ -52,8 +52,8 @@ public SnitchService defaultSnitchService(SnitchClient client, @Value("${snitche
@Secondary
@Singleton
@Named("default")
@Requires(missingProperty = "snitches.id")
public SnitchService noopSnitchService(@Value("${snitches.disabled:false}") boolean snitchesDisabled) {
@Requires(missingProperty = SnitchConfiguration.PREFIX + ".id")
public SnitchService noopSnitchService(@Value("${" + SnitchConfiguration.PREFIX + ".disabled:false}") boolean snitchesDisabled) {
if (!snitchesDisabled) {
LOGGER.warn("Micronaut Snitch is not configured! Please set snitches.id configuration property or set snitches.disabled to true to ignore this warning.");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2020-2021 Agorapulse.
*
* 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
*
* https://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 com.agorapulse.micronaut.snitch;

/**
* Main Snitch configuration.
* @author Sergio del Amo
*/
public interface SnitchConfiguration {
String PREFIX = "snitches";
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*
* Contains only the name and id.
*/
@EachProperty("snitches.jobs")
@EachProperty(SnitchConfiguration.PREFIX + ".jobs")
public class SnitchJobConfiguration {

private final String name;
Expand Down