Skip to content

Fix Literal Quotes in Env Vars #504

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Literal Quotes in Env Vars #504

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
20 changes: 13 additions & 7 deletions src/main/java/de/medizininformatikinitiative/torch/config/TorchProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,26 @@ public record TorchProperties(
@NotBlank(message = "DSE mapping tree file path is required") String dseMappingTreeFile,
boolean useCql
) {
private static final String EMPTY_QUOTES = "\"\"";

private static boolean isNotSet(String variable) {
return variable == null || variable.isBlank() || EMPTY_QUOTES.equals(variable);
}

public TorchProperties {
if (!useCql) {
if (flare == null) {
throw new IllegalArgumentException("When useCql is false, flare.url must be a non-empty string");
}
if (flare.url() == null || flare.url().isBlank()) {
if (isNotSet(flare.url())) {
throw new IllegalArgumentException("When useCql is false, flare.url must be a non-empty string");
}
}

if (fhir == null) {
throw new IllegalArgumentException("FHIR URL must not be null or empty");
}
if (fhir.url() == null || fhir.url().isBlank()) {
if (isNotSet(fhir.url())) {
throw new IllegalArgumentException("FHIR URL must not be null or empty");
}
}
Expand Down Expand Up @@ -74,8 +80,8 @@ public record Fhir(
String password) {

public Fhir {
if (user == null) user = "";
if (password == null) password = "";
if (isNotSet(user)) user = "";
if (isNotSet(password)) password = "";
if (oauth == null) {
oauth = new Oauth(new Oauth.Issuer(""), new Oauth.Client("", ""));
}
Expand All @@ -96,14 +102,14 @@ public record Oauth(@Valid Issuer issuer, @Valid Client client) {

public record Issuer(String uri) {
public Issuer {
if (uri == null) uri = "";
if (isNotSet(uri)) uri = "";
}
}

public record Client(String id, String secret) {
public Client {
if (id == null) id = "";
if (secret == null) secret = "";
if (isNotSet(id)) id = "";
if (isNotSet(secret)) secret = "";
}
}
}
Expand Down