Skip to content

fix: singleton annotation locations #1642

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.

Sign up for GitHub

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

Merged
derklaro merged 1 commit into from
May 26, 2025
Merged

fix: singleton annotation locations #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions node/api/src/main/java/eu/cloudnetservice/node/config/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion node/impl/src/main/java/eu/cloudnetservice/node/impl/config/JsonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ...-jvm/api/src/main/java/eu/cloudnetservice/wrapper/configuration/WrapperConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -29,7 +28,6 @@
*
* @since 4.0
*/
@Singleton
public interface WrapperConfiguration {

/**
Expand Down
2 changes: 2 additions & 0 deletions ...main/java/eu/cloudnetservice/wrapper/impl/configuration/DocumentWrapperConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
}
Expand Down
Loading