diff --git a/src/main/java/de/uzl/lied/mtbexporter/MtbExporter.java b/src/main/java/de/uzl/lied/mtbexporter/MtbExporter.java index cb42bec..647c933 100755 --- a/src/main/java/de/uzl/lied/mtbexporter/MtbExporter.java +++ b/src/main/java/de/uzl/lied/mtbexporter/MtbExporter.java @@ -3,12 +3,11 @@ import de.uzl.lied.mtbexporter.jobs.CheckFhirServer; import de.uzl.lied.mtbexporter.settings.ConfigurationLoader; import de.uzl.lied.mtbexporter.settings.Settings; -import org.tinylog.Logger; - import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Timer; +import org.tinylog.Logger; /** * Regularily queries FHIR server for new MTB therapie recommendations and diff --git a/src/main/java/de/uzl/lied/mtbexporter/jobs/CheckFhirServer.java b/src/main/java/de/uzl/lied/mtbexporter/jobs/CheckFhirServer.java index b069cd9..a2b616f 100755 --- a/src/main/java/de/uzl/lied/mtbexporter/jobs/CheckFhirServer.java +++ b/src/main/java/de/uzl/lied/mtbexporter/jobs/CheckFhirServer.java @@ -14,11 +14,6 @@ import de.uzl.lied.mtbexporter.model.Befund; import de.uzl.lied.mtbexporter.settings.Settings; import de.uzl.lied.mtbexporter.tasks.CsvExporter; -import org.hl7.fhir.r4.model.Bundle; -import org.hl7.fhir.r4.model.DiagnosticReport; -import org.hl7.fhir.r4.model.Observation; -import org.tinylog.Logger; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -28,6 +23,10 @@ import java.util.Date; import java.util.List; import java.util.TimerTask; +import org.hl7.fhir.r4.model.Bundle; +import org.hl7.fhir.r4.model.DiagnosticReport; +import org.hl7.fhir.r4.model.Observation; +import org.tinylog.Logger; /** * Job that is triggerd to check the FHIR server and start the export. diff --git a/src/main/java/de/uzl/lied/mtbexporter/settings/ConfigurationLoader.java b/src/main/java/de/uzl/lied/mtbexporter/settings/ConfigurationLoader.java index 410d833..8cb8a76 100755 --- a/src/main/java/de/uzl/lied/mtbexporter/settings/ConfigurationLoader.java +++ b/src/main/java/de/uzl/lied/mtbexporter/settings/ConfigurationLoader.java @@ -3,13 +3,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.google.common.io.ByteStreams; -import org.apache.commons.text.StringSubstitutor; -import org.apache.commons.text.lookup.StringLookupFactory; - import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; +import org.apache.commons.text.StringSubstitutor; +import org.apache.commons.text.lookup.StringLookupFactory; /** * Class that enables the use of environment variables in the settings.yaml diff --git a/src/main/java/de/uzl/lied/mtbexporter/settings/Settings.java b/src/main/java/de/uzl/lied/mtbexporter/settings/Settings.java index 86ccaab..dd5232d 100755 --- a/src/main/java/de/uzl/lied/mtbexporter/settings/Settings.java +++ b/src/main/java/de/uzl/lied/mtbexporter/settings/Settings.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; - import java.io.File; /** diff --git a/src/main/java/de/uzl/lied/mtbexporter/tasks/CsvExporter.java b/src/main/java/de/uzl/lied/mtbexporter/tasks/CsvExporter.java index a43b910..2ce9a11 100644 --- a/src/main/java/de/uzl/lied/mtbexporter/tasks/CsvExporter.java +++ b/src/main/java/de/uzl/lied/mtbexporter/tasks/CsvExporter.java @@ -4,6 +4,12 @@ import de.uzl.lied.mtbexporter.model.BefTherapieoptionen; import de.uzl.lied.mtbexporter.model.Befund; import de.uzl.lied.mtbexporter.model.internal.Alteration; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import org.hl7.fhir.r4.model.DiagnosticReport; import org.hl7.fhir.r4.model.Observation; import org.hl7.fhir.r4.model.Patient; @@ -13,13 +19,6 @@ import org.hl7.fhir.r4.model.Specimen; import org.hl7.fhir.r4.model.Task; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; - /** * Exporter for FHIR IG Genomics-Reporting to UKSH Orbis TKONF MTB form. */