Merge pull request #31 from nr23730/renovate/com.github.ngeor-checkst…

…yle-rules-6.x Update dependency com.github.ngeor:checkstyle-rules to v6
buschlab · Jan 18, 2024 · a29a6ab · a29a6ab
2 parents 1d37266 + 7264524
commit a29a6ab
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -148,7 +148,7 @@
           <dependency>
               <groupId>com.github.ngeor</groupId>
               <artifactId>checkstyle-rules</artifactId>
-              <version>5.3.0</version>
+              <version>6.6.0-32</version>
           </dependency>
       </dependencies>
       <configuration>

diff --git a/src/main/java/de/uzl/lied/mtbexporter/MtbExporter.java b/src/main/java/de/uzl/lied/mtbexporter/MtbExporter.java
@@ -3,11 +3,12 @@
 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
@@ -14,6 +14,11 @@
 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;
@@ -23,10 +28,6 @@
 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
@@ -3,12 +3,13 @@
 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
@@ -2,6 +2,7 @@
 
 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
@@ -4,12 +4,6 @@
 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;
@@ -19,6 +13,13 @@
 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.
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     import com.fasterxml.jackson.annotation.JsonInclude;
     import com.fasterxml.jackson.annotation.JsonProperty;
     import java.io.File;
     /**
@@ Expand Down @@