From c0171324db2c2524c6e61b0a11d4c65aca8cb119 Mon Sep 17 00:00:00 2001
From: sdelamo <sergio.delamo@softamo.com>
Date: Tue, 7 Dec 2021 07:21:39 +0100
Subject: [PATCH] extract prefix

---
 .../snitch/DefaultSnitchFactory.java          |  8 +++---
 .../micronaut/snitch/SnitchConfiguration.java | 26 +++++++++++++++++++
 .../snitch/SnitchJobConfiguration.java        |  2 +-
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchConfiguration.java

diff --git a/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/DefaultSnitchFactory.java b/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/DefaultSnitchFactory.java
index c243110..724a028 100644
--- a/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/DefaultSnitchFactory.java
+++ b/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/DefaultSnitchFactory.java
@@ -33,7 +33,7 @@ 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);
     }
@@ -41,7 +41,7 @@ public SnitchService snitchService(SnitchClient client, SnitchJobConfiguration c
     @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);
@@ -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.");
         }
diff --git a/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchConfiguration.java b/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchConfiguration.java
new file mode 100644
index 0000000..9515ccf
--- /dev/null
+++ b/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchConfiguration.java
@@ -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";
+}
diff --git a/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchJobConfiguration.java b/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchJobConfiguration.java
index 5fa59ca..d981709 100644
--- a/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchJobConfiguration.java
+++ b/libs/micronaut-snitch/src/main/java/com/agorapulse/micronaut/snitch/SnitchJobConfiguration.java
@@ -25,7 +25,7 @@
  *
  * Contains only the name and id.
  */
-@EachProperty("snitches.jobs")
+@EachProperty(SnitchConfiguration.PREFIX + ".jobs")
 public class SnitchJobConfiguration {
 
     private final String name;