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

extra ConfigLoader methods #940

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
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
22 changes: 21 additions & 1 deletion src/main/java/net/openhft/chronicle/wire/utils/ConfigLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.openhft.chronicle.core.io.IOTools;
import net.openhft.chronicle.wire.TextWire;
import net.openhft.chronicle.wire.WireType;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -51,13 +52,32 @@ public static <T> T loadFromFile(Class<?> classLoader, String filename, Properti
return loadWithProperties(loadFile(classLoader, filename), properties);
}

public static <T> T loadFromFile(Class<T> expectedClass, Class<?> classLoader, String filename, Properties properties) throws IOException {
return loadWithProperties(expectedClass, loadFile(classLoader, filename), properties);
}

@SuppressWarnings("unchecked")
public static <T> T load(String fileAsString) {
return (T) TextWire.from(replaceTokensWithProperties(fileAsString)).readObject();
}

@SuppressWarnings("unchecked")
public static <T> T loadWithProperties(String fileAsString) {
return loadWithProperties(fileAsString, System.getProperties());
}

@SuppressWarnings("unchecked")
public static <T> T loadWithProperties(String fileAsString, Properties properties) {
return (T) TextWire.from(replaceTokensWithProperties(fileAsString, properties)).readObject();
return loadWithProperties(null, fileAsString, properties);
}

@SuppressWarnings("unchecked")
public static <T> T loadWithProperties(Class<T> expectedClass, String fileAsString) {
return loadWithProperties(expectedClass, fileAsString, System.getProperties());
}

@SuppressWarnings("unchecked")
public static <T> T loadWithProperties(Class<T> expectedClass, String fileAsString, Properties properties) {
return WireType.TEXT.fromString(expectedClass, replaceTokensWithProperties(fileAsString, properties));
}
}