From 3802b876646075b9de220b98fe17142cc0940ba0 Mon Sep 17 00:00:00 2001
From: Pasqual Koschmieder <git@derklaro.dev>
Date: Mon, 26 May 2025 23:54:27 +0200
Subject: [PATCH] fix: singleton annotation locations

---
 .../main/java/eu/cloudnetservice/node/config/Configuration.java | 2 --
 .../eu/cloudnetservice/node/impl/config/JsonConfiguration.java  | 2 +-
 .../wrapper/configuration/WrapperConfiguration.java             | 2 --
 .../impl/configuration/DocumentWrapperConfiguration.java        | 2 ++
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/node/api/src/main/java/eu/cloudnetservice/node/config/Configuration.java b/node/api/src/main/java/eu/cloudnetservice/node/config/Configuration.java
index 55192f090f..2fe766c718 100644
--- a/node/api/src/main/java/eu/cloudnetservice/node/config/Configuration.java
+++ b/node/api/src/main/java/eu/cloudnetservice/node/config/Configuration.java
@@ -20,12 +20,10 @@
 import eu.cloudnetservice.driver.cluster.NetworkClusterNode;
 import eu.cloudnetservice.driver.document.Document;
 import eu.cloudnetservice.driver.network.ssl.SSLConfiguration;
-import jakarta.inject.Singleton;
 import java.util.Collection;
 import java.util.Map;
 import lombok.NonNull;
 
-@Singleton
 public interface Configuration {
 
   boolean fileExists();
diff --git a/node/impl/src/main/java/eu/cloudnetservice/node/impl/config/JsonConfiguration.java b/node/impl/src/main/java/eu/cloudnetservice/node/impl/config/JsonConfiguration.java
index 50a70e1e96..330017a65c 100644
--- a/node/impl/src/main/java/eu/cloudnetservice/node/impl/config/JsonConfiguration.java
+++ b/node/impl/src/main/java/eu/cloudnetservice/node/impl/config/JsonConfiguration.java
@@ -46,7 +46,6 @@
 import java.util.function.Function;
 import lombok.NonNull;
 
-@Singleton
 public final class JsonConfiguration implements Configuration {
 
   public static final Path CONFIG_FILE_PATH = Path.of(
@@ -131,6 +130,7 @@ public JsonConfiguration() {
   }
 
   @Factory
+  @Singleton
   private static @NonNull Configuration loadFromFile(@NonNull DefaultInstallation installation) {
     if (Files.notExists(CONFIG_FILE_PATH)) {
       // register the setup if the file does not exist
diff --git a/wrapper-jvm/api/src/main/java/eu/cloudnetservice/wrapper/configuration/WrapperConfiguration.java b/wrapper-jvm/api/src/main/java/eu/cloudnetservice/wrapper/configuration/WrapperConfiguration.java
index b19d25ab18..54b0381286 100644
--- a/wrapper-jvm/api/src/main/java/eu/cloudnetservice/wrapper/configuration/WrapperConfiguration.java
+++ b/wrapper-jvm/api/src/main/java/eu/cloudnetservice/wrapper/configuration/WrapperConfiguration.java
@@ -20,7 +20,6 @@
 import eu.cloudnetservice.driver.network.ssl.SSLConfiguration;
 import eu.cloudnetservice.driver.service.ServiceConfiguration;
 import eu.cloudnetservice.driver.service.ServiceInfoSnapshot;
-import jakarta.inject.Singleton;
 import lombok.NonNull;
 
 /**
@@ -29,7 +28,6 @@
  *
  * @since 4.0
  */
-@Singleton
 public interface WrapperConfiguration {
 
   /**
diff --git a/wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/configuration/DocumentWrapperConfiguration.java b/wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/configuration/DocumentWrapperConfiguration.java
index d0cc493091..9e36d56f80 100644
--- a/wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/configuration/DocumentWrapperConfiguration.java
+++ b/wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/configuration/DocumentWrapperConfiguration.java
@@ -23,6 +23,7 @@
 import eu.cloudnetservice.driver.service.ServiceConfiguration;
 import eu.cloudnetservice.driver.service.ServiceInfoSnapshot;
 import eu.cloudnetservice.wrapper.configuration.WrapperConfiguration;
+import jakarta.inject.Singleton;
 import java.nio.file.Path;
 import lombok.NonNull;
 
@@ -37,6 +38,7 @@ public record DocumentWrapperConfiguration(
     System.getProperty("cloudnet.wrapper.config.path", ".wrapper/wrapper.json"));
 
   @Factory
+  @Singleton
   public static @NonNull WrapperConfiguration load() {
     return DocumentFactory.json().parse(WRAPPER_CONFIG_PATH).toInstanceOf(DocumentWrapperConfiguration.class);
   }