Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ RUN mvn -q package -DskipTests=true
FROM eclipse-temurin:24
WORKDIR /opt/app
COPY --from=build /tmp/target/FairDataPointSchemaTool-1.0.jar /opt/app
COPY --from=build /tmp/FdpSettings.json /opt/app
ENTRYPOINT ["java", "-jar", "FairDataPointSchemaTool-1.0.jar"]
19 changes: 17 additions & 2 deletions src/main/java/nl/healthri/fdp/uploadschema/SchemaTools.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public void run() {

fdpService.authenticate(this.username, this.password);

final Settings newFdpSettings = Settings.GetSettings(settingsFile);
final File resolvedSettingsFile = resolveSettingsFile(settingsFile);
final Settings newFdpSettings = Settings.GetSettings(resolvedSettingsFile);
fdpService.updateSettings(newFdpSettings);

switch (command) {
Expand All @@ -98,6 +99,20 @@ public void run() {
}
}

private File resolveSettingsFile(File configuredFile) {
if (configuredFile != null && configuredFile.exists() && configuredFile.isFile()) {
return configuredFile;
}

File defaultFile = new File("./FdpSettings.json");
if (configuredFile == null) {
logger.warn("Settings file not provided. Falling back to default: {}", defaultFile.getAbsolutePath());
} else {
logger.warn("Settings file not found: {}. Falling back to default: {}", configuredFile.getAbsolutePath(), defaultFile.getAbsolutePath());
}
return defaultFile;
}

public enum CommandEnum {
SCHEMA, RESOURCE, BOTH, TEMPLATE
}
Expand Down Expand Up @@ -125,4 +140,4 @@ public URI convert(String value) {
}
}

}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package nl.healthri.fdp.uploadschema.dto.settings;

import com.fasterxml.jackson.databind.ObjectMapper;
import nl.healthri.fdp.uploadschema.config.fdp.Settings;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import java.util.List;

@JsonIgnoreProperties(ignoreUnknown = true)
public record SettingsResponseDto(
String clientUrl,
String persistentUrl,
Expand All @@ -18,33 +18,40 @@ public record SettingsResponseDto(
Search search,
Forms forms
) {
@JsonIgnoreProperties(ignoreUnknown = true)
public record MetadataMetric(
String metricUri,
String resourceUri
) {}

@JsonIgnoreProperties(ignoreUnknown = true)
public record Ping(
boolean enabled,
List<String> endpoints,
List<String> endpointsFromConfig,
String interval
) {}

@JsonIgnoreProperties(ignoreUnknown = true)
public record Repository(
String type
) {}

@JsonIgnoreProperties(ignoreUnknown = true)
public record Search(
List<String> filters
) {}

@JsonIgnoreProperties(ignoreUnknown = true)
public record Forms(
Autocomplete autocomplete
) {
@JsonIgnoreProperties(ignoreUnknown = true)
public record Autocomplete(
boolean searchNamespace,
List<Source> sources
) {
@JsonIgnoreProperties(ignoreUnknown = true)
public record Source(
String rdfType,
String sparqlEndpoint,
Expand All @@ -55,4 +62,3 @@ public record Source(

}