diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index 040cac8..f0fe8cc 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -13,6 +13,10 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
           cache: 'maven'
+      - name: Run Spotless Apply
+        run: mvn spotless:apply
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Maven
         run: mvn --file pom.xml clean install
         env:
diff --git a/eclipse-java-formatter.xml b/eclipse-java-formatter.xml
new file mode 100644
index 0000000..4ae144a
--- /dev/null
+++ b/eclipse-java-formatter.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="13">
+    <profile kind="CodeFormatterProfile" name="Custom-4spaces-NoCommentSplit" version="13">
+
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="9999"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+
+    </profile>
+</profiles>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3dadd4d..4e29ed8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <common.version>2.0.2.0</common.version>
+        <common.version>2.0.5</common.version>
         <jackson.version>2.12.7</jackson.version>
+        <spotlessMavenPlugin.version>2.43.0</spotlessMavenPlugin.version>
+        <googleJavaFormat.version>1.17.0</googleJavaFormat.version>
     </properties>
 
     <repositories>
@@ -67,7 +69,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.5.0</version>
+            <version>42.6.1</version>
         </dependency>
 
         <dependency>
@@ -175,7 +177,7 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>3.8.0</version>
+            <version>4.8.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -226,6 +228,32 @@
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>${spotlessMavenPlugin.version}</version>
+                <configuration>
+                    <java>
+                        <eclipse>
+                            <file>${project.basedir}/eclipse-java-formatter.xml</file>
+                        </eclipse>
+                    </java>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>spotless-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>spotless-apply</id>
+                        <goals>
+                            <goal>apply</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
 
     </build>
diff --git a/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java b/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java
index dbe81a5..9b01c1a 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java
@@ -5,8 +5,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public
-class HfpDataParser {
+public class HfpDataParser {
     public Hfp.Data parseFrom(byte[] data) throws InvalidProtocolBufferException {
         return Hfp.Data.parseFrom(data);
     }
diff --git a/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java b/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java
index 6382e61..e3eb565 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java
@@ -5,10 +5,8 @@
 import org.apache.pulsar.client.api.Message;
 import org.springframework.stereotype.Component;
 
-
 @Component
-public
-class TransitDataSchemaWrapper {
+public class TransitDataSchemaWrapper {
     public boolean hasProtobufSchema(Message message) {
         return TransitdataSchema.hasProtobufSchema(message, TransitdataProperties.ProtobufSchema.HfpData);
     }
diff --git a/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java b/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java
index 48bfbb1..ffdbeb4 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java
@@ -17,11 +17,7 @@
 
 @Configuration
 @PropertySource({"classpath:application.properties"})
-@EnableJpaRepositories(
-        basePackages = "fi.hsl.transitlog.hfp.domain.repositories",
-        entityManagerFactoryRef = "devWriteEntityManager",
-        transactionManagerRef = "devWriteTransactionManager"
-)
+@EnableJpaRepositories(basePackages = "fi.hsl.transitlog.hfp.domain.repositories", entityManagerFactoryRef = "devWriteEntityManager", transactionManagerRef = "devWriteTransactionManager")
 @Profile(value = {"default", "dev"})
 @EnableTransactionManagement
 @EnableAsync
@@ -32,28 +28,22 @@ public class DatabaseConfiguration {
     @Bean
     @Primary
     public PlatformTransactionManager devWriteTransactionManager() {
-        JpaTransactionManager transactionManager
-                = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(
-                devWriteEntityManager().getObject());
+        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(devWriteEntityManager().getObject());
         return transactionManager;
     }
 
     @Bean
     @Primary
     public LocalContainerEntityManagerFactoryBean devWriteEntityManager() {
-        LocalContainerEntityManagerFactoryBean em
-                = new LocalContainerEntityManagerFactoryBean();
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(devWriteDataSource());
-        em.setPackagesToScan(
-                "fi.hsl.transitlog.hfp.domain");
+        em.setPackagesToScan("fi.hsl.transitlog.hfp.domain");
 
-        HibernateJpaVendorAdapter vendorAdapter
-                = new HibernateJpaVendorAdapter();
+        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
         HashMap<String, Object> properties = new HashMap<>();
-        properties.put("hibernate.dialect",
-                env.getProperty("hibernate.dialect"));
+        properties.put("hibernate.dialect", env.getProperty("hibernate.dialect"));
         properties.put("hibernate.order_inserts", true);
         properties.put("hibernate.jdbc.batch_size", 5000);
         properties.put("hibernate.order_updates", true);
@@ -70,10 +60,8 @@ public LocalContainerEntityManagerFactoryBean devWriteEntityManager() {
     @Bean
     @Primary
     public DataSource devWriteDataSource() {
-        HikariDataSource dataSource
-                = new HikariDataSource();
-        dataSource.setDriverClassName(
-                env.getProperty("jdbc.driverClassName"));
+        HikariDataSource dataSource = new HikariDataSource();
+        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
         dataSource.setJdbcUrl(env.getProperty("jdbc.url"));
         dataSource.setUsername(env.getProperty("jdbc.user"));
         dataSource.setPassword(env.getProperty("jdbc.pass"));
diff --git a/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java b/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java
index d661f5e..ac21a09 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java
@@ -16,13 +16,11 @@
 
 @MappedSuperclass
 @EqualsAndHashCode
-@JsonSubTypes({
-        @JsonSubTypes.Type(value = VehiclePosition.class, name = "vehicleposition"),
+@JsonSubTypes({@JsonSubTypes.Type(value = VehiclePosition.class, name = "vehicleposition"),
         @JsonSubTypes.Type(value = LightPriorityEvent.class, name = "lightpriorityevent"),
         @JsonSubTypes.Type(value = OtherEvent.class, name = "otherevent"),
         @JsonSubTypes.Type(value = StopEvent.class, name = "stopevent"),
-        @JsonSubTypes.Type(value = UnsignedEvent.class, name = "unsignedevent")
-})
+        @JsonSubTypes.Type(value = UnsignedEvent.class, name = "unsignedevent")})
 @Data
 @Slf4j
 public abstract class Event {
@@ -91,7 +89,8 @@ public Event(Hfp.Topic topic, Hfp.Payload payload) {
         this.route_id = topic.hasRouteId() ? topic.getRouteId() : null;
         this.direction_id = topic.hasDirectionId() ? topic.getDirectionId() : null;
         this.headsign = topic.hasHeadsign() ? topic.getHeadsign() : null;
-        Optional<Time> maybeStartTime = wrapToOptional(topic::hasStartTime, topic::getStartTime).flatMap(HfpParser::safeParseTime);
+        Optional<Time> maybeStartTime = wrapToOptional(topic::hasStartTime, topic::getStartTime)
+                .flatMap(HfpParser::safeParseTime);
         this.journey_start_time = maybeStartTime.orElse(null);
         this.next_stop_id = topic.hasNextStop() ? topic.getNextStop() : null;
         this.geohash_level = topic.hasGeohashLevel() ? topic.getGeohashLevel() : null;
@@ -100,7 +99,8 @@ public Event(Hfp.Topic topic, Hfp.Payload payload) {
         this.lat = payload.hasLat() ? payload.getLat() : null;
         this.longitude = payload.hasLong() ? payload.getLong() : null;
         this.desi = payload.hasDesi() ? payload.getDesi() : null;
-        Optional<Integer> maybeDirection = wrapToOptional(payload::hasDir, payload::getDir).flatMap(HfpParser::safeParseInt);
+        Optional<Integer> maybeDirection = wrapToOptional(payload::hasDir, payload::getDir)
+                .flatMap(HfpParser::safeParseInt);
         this.dir = maybeDirection.orElse(null);
         this.oper = payload.hasOper() ? payload.getOper() : null;
         this.veh = payload.hasVeh() ? payload.getVeh() : null;
@@ -110,13 +110,16 @@ public Event(Hfp.Topic topic, Hfp.Payload payload) {
         this.acc = payload.hasAcc() ? payload.getAcc() : null;
         this.dl = payload.hasDl() ? payload.getDl() : null;
         this.odo = payload.hasOdo() ? payload.getOdo() : null;
-        Optional<Boolean> maybeDoors = wrapToOptional(payload::hasDrst, payload::getDrst).flatMap(HfpParser::safeParseBoolean);
+        Optional<Boolean> maybeDoors = wrapToOptional(payload::hasDrst, payload::getDrst)
+                .flatMap(HfpParser::safeParseBoolean);
         this.drst = maybeDoors.orElse(null);
-        Optional<java.sql.Date> maybeOperatingDay = wrapToOptional(payload::hasOday, payload::getOday).flatMap(HfpParser::safeParseDate);
+        Optional<java.sql.Date> maybeOperatingDay = wrapToOptional(payload::hasOday, payload::getOday)
+                .flatMap(HfpParser::safeParseDate);
         this.oday = maybeOperatingDay.orElse(null);
         this.jrn = payload.hasJrn() ? payload.getJrn() : null;
         this.line = payload.hasLine() ? payload.getLine() : null;
-        Optional<Time> maybeStart = wrapToOptional(payload::hasStart, payload::getStart).flatMap(HfpParser::safeParseTime);
+        Optional<Time> maybeStart = wrapToOptional(payload::hasStart, payload::getStart)
+                .flatMap(HfpParser::safeParseTime);
         this.start = maybeStart.orElse(null);
         this.location_quality_method = payload.hasLoc() ? payload.getLoc().toString() : null;
         this.stop = payload.hasStop() ? payload.getStop() : null;
diff --git a/src/main/java/fi/hsl/transitlog/hfp/domain/LightPriorityEvent.java b/src/main/java/fi/hsl/transitlog/hfp/domain/LightPriorityEvent.java
index 6f9b4e1..de2b8c1 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/domain/LightPriorityEvent.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/domain/LightPriorityEvent.java
@@ -36,7 +36,7 @@ public LightPriorityEvent(Hfp.Topic topic, Hfp.Payload payload) {
         this.tlp_line_configid = payload.hasTlpLineConfigid() ? payload.getTlpLineConfigid() : null;
         this.tlp_point_configid = payload.hasTlpPointConfigid() ? payload.getTlpPointConfigid() : null;
         this.tlp_frequency = payload.hasTlpFrequency() ? payload.getTlpFrequency() : null;
-        this.tlp_protocol = payload.hasTlpProtocol  () ? payload.getTlpProtocol() : null;
+        this.tlp_protocol = payload.hasTlpProtocol() ? payload.getTlpProtocol() : null;
     }
 
     public LightPriorityEvent() {
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/DomainMappingWriter.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/DomainMappingWriter.java
index 4934d71..255bfe9 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/DomainMappingWriter.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/DomainMappingWriter.java
@@ -49,13 +49,9 @@ public class DomainMappingWriter {
     };
 
     @Autowired
-    DomainMappingWriter(DWUpload dwUpload,
-                        PulsarApplication pulsarApplication,
-                        EntityManager entityManager,
-                        DumpService dumpTask,
-                        EventFactory eventFactory,
-                        @Value(value = "${hfp.tstMaxPast}") Integer hfpTstMaxPast,
-                        @Value(value = "${hfp.tstMaxFuture}") Integer hfpTstMaxFuture) {
+    DomainMappingWriter(DWUpload dwUpload, PulsarApplication pulsarApplication, EntityManager entityManager,
+            DumpService dumpTask, EventFactory eventFactory, @Value(value = "${hfp.tstMaxPast}") Integer hfpTstMaxPast,
+            @Value(value = "${hfp.tstMaxFuture}") Integer hfpTstMaxFuture) {
         this.DWUpload = dwUpload;
         eventQueue = new ConcurrentHashMap<>();
         this.dumpTask = dumpTask;
@@ -76,55 +72,58 @@ public class DomainMappingWriter {
     void process(MessageId msgId, Hfp.Data data) throws IOException, ParseException {
         Event event = null;
         switch (data.getTopic().getEventType()) {
-            case VP:
+            case VP :
                 switch (data.getTopic().getJourneyType()) {
-                    case journey:
+                    case journey :
                         event = eventFactory.createVehiclePositionEvent(data.getTopic(), data.getPayload());
                         break;
-                    case deadrun:
+                    case deadrun :
                         event = eventFactory.createUnsignedEvent(data.getTopic(), data.getPayload());
                         break;
-                    default:
+                    default :
                         if (data.getTopic().getJourneyType() != Hfp.Topic.JourneyType.signoff) {
                             log.warn("Received unknown journey type {}", data.getTopic().getJourneyType());
                         }
                 }
                 break;
-            case DUE:
-            case ARR:
-            case ARS:
-            case PDE:
-            case DEP:
-            case PAS:
-            case WAIT:
+            case DUE :
+            case ARR :
+            case ARS :
+            case PDE :
+            case DEP :
+            case PAS :
+            case WAIT :
                 event = eventFactory.createStopEvent(data.getTopic(), data.getPayload());
                 break;
-            case TLR:
-            case TLA:
+            case TLR :
+            case TLA :
                 event = eventFactory.createLightPriorityEvent(data.getTopic(), data.getPayload());
                 break;
-            case DOO:
-            case DOC:
-            case DA:
-            case DOUT:
-            case BA:
-            case BOUT:
-            case VJA:
-            case VJOUT:
+            case DOO :
+            case DOC :
+            case DA :
+            case DOUT :
+            case BA :
+            case BOUT :
+            case VJA :
+            case VJOUT :
                 event = eventFactory.createOtherEvent(data.getTopic(), data.getPayload());
                 break;
-            default:
+            default :
                 log.warn("Received HFP message with unknown event type: {}", data.getTopic().getEventType());
         }
 
         if (event != null) {
             //Do not insert data where the timestamp (tst) is too far away from the time when the message was received (received_at)
             if (event.getTst() != null
-                    && Duration.between(event.getTst().toInstant(), event.getReceived_at().toInstant()).compareTo(hfpTstMaxPast) < 0
-                    && Duration.between(event.getReceived_at().toInstant(), event.getTst().toInstant()).compareTo(hfpTstMaxFuture) < 0) {
+                    && Duration.between(event.getTst().toInstant(), event.getReceived_at().toInstant())
+                            .compareTo(hfpTstMaxPast) < 0
+                    && Duration.between(event.getReceived_at().toInstant(), event.getTst().toInstant())
+                            .compareTo(hfpTstMaxFuture) < 0) {
                 eventQueue.put(msgId, event);
             } else {
-                log.warn("tst for {} was outside accepted range of -{} to +{} days", event, hfpTstMaxPast, hfpTstMaxFuture);
+                log.warn("tst for {} was outside accepted range of -{} to +{} days", event, hfpTstMaxPast,
+                        hfpTstMaxFuture);
                 ack(msgId);
             }
             DWUpload.uploadBlob(event);
@@ -163,12 +162,10 @@ void close(boolean closePulsar) {
     }
 
     public void ack(MessageId received) {
-        consumer.acknowledgeAsync(received)
-                .exceptionally(throwable -> {
-                    log.error("Failed to ack Pulsar message", throwable);
-                    return null;
-                })
-                .thenRun(() -> {
-                });
+        consumer.acknowledgeAsync(received).exceptionally(throwable -> {
+            log.error("Failed to ack Pulsar message", throwable);
+            return null;
+        }).thenRun(() -> {
+        });
     }
 }
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/MessageProcessor.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/MessageProcessor.java
index 834648c..2013f5a 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/MessageProcessor.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/MessageProcessor.java
@@ -16,7 +16,8 @@ public class MessageProcessor implements IMessageHandler {
     private final HfpDataParser hfpDataParser;
     private DomainMappingWriter domainMappingWriter;
 
-    public MessageProcessor(DomainMappingWriter writer, TransitDataSchemaWrapper transitdataSchemaWrapper, HfpDataParser hfpDataParser) {
+    public MessageProcessor(DomainMappingWriter writer, TransitDataSchemaWrapper transitdataSchemaWrapper,
+            HfpDataParser hfpDataParser) {
         this.domainMappingWriter = writer;
         this.transitdataSchemaWrapper = transitdataSchemaWrapper;
         this.hfpDataParser = hfpDataParser;
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/PulsarListenerService.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/PulsarListenerService.java
index 2617cf6..5f8f2fb 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/PulsarListenerService.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/PulsarListenerService.java
@@ -17,7 +17,8 @@ public class PulsarListenerService {
     private MessageProcessor messageProcessor;
 
     @Autowired
-    public PulsarListenerService(DomainMappingWriter domainMappingWriter, PulsarApplication pulsarApplication, MessageProcessor messageProcessor) {
+    public PulsarListenerService(DomainMappingWriter domainMappingWriter, PulsarApplication pulsarApplication,
+            MessageProcessor messageProcessor) {
         this.domainMappingWriter = domainMappingWriter;
         this.pulsarApplication = pulsarApplication;
         this.messageProcessor = messageProcessor;
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/DWFile.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/DWFile.java
index 995d63e..ee876cc 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/DWFile.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/DWFile.java
@@ -36,7 +36,6 @@ public DWFile(String absoluteFilePath) throws IOException, ParseException {
         fileCreatedAt = dwFilename.fileTimeStampNow();
     }
 
-
     public DWFile(File file) throws ParseException {
         this.filePath = file.getPath();
         this.file = file;
@@ -61,7 +60,6 @@ private long fileLastModified() {
         return file.lastModified();
     }
 
-
     @Override
     public int hashCode() {
         return filePath.hashCode() * 31;
@@ -76,8 +74,7 @@ public boolean equals(Object obj) {
     }
 
     @NoArgsConstructor
-    static
-    class DWFileName {
+    static class DWFileName {
         //Hours 0-23
         private static final String DW_FILE_DATEFORMAT = "yyyy-MM-dd";
         private static final String TIMEZONE = "Europe/Helsinki";
@@ -93,8 +90,10 @@ String createFileName(String rootFolder, Event event) {
         }
 
         private static String eventDateInDWFormat(Event event) {
-            LocalDateTime tstLocalizedDateTime = event.getTst().toInstant().atZone(ZoneId.of(DWFileName.TIMEZONE)).toLocalDateTime();
-            DateTimeFormatter year_month_day_format = DateTimeFormatter.ofPattern(DWFileName.DW_FILE_DATEFORMAT, Locale.ENGLISH);
+            LocalDateTime tstLocalizedDateTime = event.getTst().toInstant().atZone(ZoneId.of(DWFileName.TIMEZONE))
+                    .toLocalDateTime();
+            DateTimeFormatter year_month_day_format = DateTimeFormatter.ofPattern(DWFileName.DW_FILE_DATEFORMAT,
+                    Locale.ENGLISH);
             return year_month_day_format.format(tstLocalizedDateTime);
         }
 
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWService.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWService.java
index 0774248..6921277 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWService.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWService.java
@@ -36,9 +36,11 @@ public class LazyDWService implements DWUpload {
     private boolean enabled;
 
     @Autowired
-    LazyDWService(AzureUploader azureUploader, @Value("${fileLastModifiedInSecondsBuffer:1800}")
-            Integer fileLastModifiedInSecondsBuffer, @Value("${filepath:csv}")
-                          String filePath, @Value("${delayBeforeFileDeletionSeconds:1800}") Integer delayBeforeFileDeletionSeconds, @Value("${csvUploadEnabled:true}") Boolean enabled) throws ParseException {
+    LazyDWService(AzureUploader azureUploader,
+            @Value("${fileLastModifiedInSecondsBuffer:1800}") Integer fileLastModifiedInSecondsBuffer,
+            @Value("${filepath:csv}") String filePath,
+            @Value("${delayBeforeFileDeletionSeconds:1800}") Integer delayBeforeFileDeletionSeconds,
+            @Value("${csvUploadEnabled:true}") Boolean enabled) throws ParseException {
         this.fileLastModifiedInSecondsBuffer = fileLastModifiedInSecondsBuffer;
         this.delayBeforeFileDeletion = delayBeforeFileDeletionSeconds;
         this.filePath = filePath;
@@ -64,10 +66,8 @@ public void uploadOldEnough() {
     }
 
     private Set<DWFile> filterSuitableUploads() {
-        return dwFileSet.stream()
-                .filter(dwFile -> dwFile.fileSuitableForUpload(fileLastModifiedInSecondsBuffer))
-                .map(this::uploadFile)
-                .collect(Collectors.toSet());
+        return dwFileSet.stream().filter(dwFile -> dwFile.fileSuitableForUpload(fileLastModifiedInSecondsBuffer))
+                .map(this::uploadFile).collect(Collectors.toSet());
     }
 
     private DWFile uploadFile(DWFile dwFile) {
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureBlobClient.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureBlobClient.java
index b1867d7..a050fcf 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureBlobClient.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureBlobClient.java
@@ -11,10 +11,9 @@ public class AzureBlobClient {
 
     private BlobContainerClient blobContainerClient;
 
-    AzureBlobClient(@Value(value = "${blobstorage.connectionString}") String connectionString, @Value(value = "${blobstorage.blobcontainer}") String blobContainer) {
-        this.blobServiceClient = new BlobServiceClientBuilder()
-                .connectionString(connectionString)
-                .buildClient();
+    AzureBlobClient(@Value(value = "${blobstorage.connectionString}") String connectionString,
+            @Value(value = "${blobstorage.blobcontainer}") String blobContainer) {
+        this.blobServiceClient = new BlobServiceClientBuilder().connectionString(connectionString).buildClient();
 
         this.blobContainer = blobContainer;
     }
@@ -41,4 +40,3 @@ public boolean fileExists(String filePath) {
         return getBlobContainerClient().exists();
     }
 }
-
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureUploader.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureUploader.java
index d964204..611634a 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureUploader.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/AzureUploader.java
@@ -1,12 +1,10 @@
 package fi.hsl.transitlog.hfp.persisthfpdata.archivetodw.azure;
 
-
 import org.springframework.beans.factory.annotation.*;
 import org.springframework.stereotype.*;
 
 @Component
-public
-class AzureUploader {
+public class AzureUploader {
     final AzureBlobClient azureBlobClient;
     private final PrivateAzureBlobClient privateAzureBlobClient;
 
@@ -24,5 +22,4 @@ public AzureUploadTask uploadBlob(String filePath) {
         return new AzureUploadTask(azureBlobClient, filePath).run();
     }
 
-
 }
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/PrivateAzureBlobClient.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/PrivateAzureBlobClient.java
index 562ec36..9cda15c 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/PrivateAzureBlobClient.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/azure/PrivateAzureBlobClient.java
@@ -6,7 +6,8 @@
 
 @Component
 public class PrivateAzureBlobClient extends AzureBlobClient {
-    PrivateAzureBlobClient(@Value("${blobstorage.connectionString}") String connectionString, @Value("${blobstorage.privateblobcontainer}") String blobContainer) {
+    PrivateAzureBlobClient(@Value("${blobstorage.connectionString}") String connectionString,
+            @Value("${blobstorage.privateblobcontainer}") String blobContainer) {
         super(connectionString, blobContainer);
     }
 
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/CSVMapper.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/CSVMapper.java
index 0ac78b0..4374791 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/CSVMapper.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/CSVMapper.java
@@ -10,8 +10,7 @@ public String format(Event event) throws JsonProcessingException {
         CsvMapper schemaMapper = new CsvMapper();
         CsvSchema schema = schemaMapper.typedSchemaFor(event.getClass());
         ObjectWriter writer = schemaMapper.writer(schema);
-        return
-                writer.writeValueAsString(event);
+        return writer.writeValueAsString(event);
 
     }
 }
\ No newline at end of file
diff --git a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/FileStream.java b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/FileStream.java
index 2b3dc21..3e67c10 100644
--- a/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/FileStream.java
+++ b/src/main/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/filesystem/FileStream.java
@@ -9,8 +9,7 @@
 import java.util.*;
 import java.util.concurrent.*;
 
-public
-class FileStream {
+public class FileStream {
     private final String csvFolder;
     private CSVMapper csvMapper;
     private Map<String, DWFile> dwFiles;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f0c7de9..4d99aa0 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 jdbc.driverClassName=org.postgresql.Driver
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
-jdbc.url=jdbc:postgresql://${TIMESCALEDB_ADDRESS}/citus?user=citus&sslmode=require&reWriteBatchedInserts=true
+jdbc.url=jdbc:postgresql://${TIMESCALEDB_ADDRESS}/citus?user=${timescale_db_username}&sslmode=require&reWriteBatchedInserts=true
 jdbc.user=${timescale_db_username}
 jdbc.pass=${timescale_db_password}
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
diff --git a/src/test/java/config/H2Configuration.java b/src/test/java/config/H2Configuration.java
index 6ab77b2..fffdbe1 100644
--- a/src/test/java/config/H2Configuration.java
+++ b/src/test/java/config/H2Configuration.java
@@ -19,38 +19,28 @@
 @Configuration
 @EnableTransactionManagement
 @Profile(value = "integration-test")
-@EnableJpaRepositories(
-        basePackages = "fi.hsl.transitlog.hfp.domain.repositories",
-        entityManagerFactoryRef = "entityManager"
-)
+@EnableJpaRepositories(basePackages = "fi.hsl.transitlog.hfp.domain.repositories", entityManagerFactoryRef = "entityManager")
 public class H2Configuration {
     @Autowired
     private Environment env;
 
     @Bean
     public PlatformTransactionManager transactionManager() {
-        JpaTransactionManager transactionManager
-                = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(
-                entityManager().getObject());
+        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManager().getObject());
         return transactionManager;
     }
 
     @Bean
     public LocalContainerEntityManagerFactoryBean entityManager() {
-        LocalContainerEntityManagerFactoryBean em
-                = new LocalContainerEntityManagerFactoryBean();
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(
-                "fi.hsl.transitlog.hfp.domain");
-        HibernateJpaVendorAdapter vendorAdapter
-                = new HibernateJpaVendorAdapter();
+        em.setPackagesToScan("fi.hsl.transitlog.hfp.domain");
+        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
         HashMap<String, Object> properties = new HashMap<>();
-        properties.put("hibernate.hbm2ddl.auto",
-                env.getProperty("hibernate.hbm2ddl.auto"));
-        properties.put("hibernate.dialect",
-                env.getProperty("hibernate.dialect"));
+        properties.put("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        properties.put("hibernate.dialect", env.getProperty("hibernate.dialect"));
         em.setJpaPropertyMap(properties);
 
         return em;
@@ -58,10 +48,8 @@ public LocalContainerEntityManagerFactoryBean entityManager() {
 
     @Bean
     public DataSource dataSource() {
-        HikariDataSource dataSource
-                = new HikariDataSource();
-        dataSource.setDriverClassName(
-                env.getProperty("jdbc.driverClassName"));
+        HikariDataSource dataSource = new HikariDataSource();
+        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
         dataSource.setJdbcUrl(env.getProperty("jdbc.url"));
         dataSource.setAutoCommit(false);
         return dataSource;
diff --git a/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/DumpServiceIT.java b/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/DumpServiceIT.java
index 06f0eae..7f57ce3 100644
--- a/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/DumpServiceIT.java
+++ b/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/DumpServiceIT.java
@@ -27,11 +27,9 @@ class DumpServiceIT {
     void dump() {
         //TODO Keksi tapa lähettää brokerille viestiä
 
-        List<Event> all =
-                eventRepository.findAll();
+        List<Event> all = eventRepository.findAll();
 
         //TODO Assertoi mitä meni kantaan
     }
 
-
 }
\ No newline at end of file
diff --git a/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWServiceTest.java b/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWServiceTest.java
index a2c709c..080b1b9 100644
--- a/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWServiceTest.java
+++ b/src/test/java/fi/hsl/transitlog/hfp/persisthfpdata/archivetodw/LazyDWServiceTest.java
@@ -33,8 +33,8 @@ void setUp() throws IOException, ParseException {
         file.createNewFile();
         blobClientWrapper = mock(AzureBlobClient.class);
         privateBlobClient = mock(PrivateAzureBlobClient.class);
-        this.lazyBlobStorage = new LazyDWService(new AzureUploader(blobClientWrapper, privateBlobClient), 1, fileFolder, 3, true);
-
+        this.lazyBlobStorage = new LazyDWService(new AzureUploader(blobClientWrapper, privateBlobClient), 1, fileFolder,
+                3, true);
 
         when(privateBlobClient.fileExists(any())).thenReturn(true);
         when(blobClientWrapper.fileExists(any())).thenReturn(true);
@@ -53,9 +53,7 @@ void uploadOtherEvent() throws IOException, InterruptedException, ParseException
     }
 
     private void verifyFileDeleted(File file) {
-        await()
-                .atMost(60, TimeUnit.SECONDS)
-                .pollDelay(5, TimeUnit.SECONDS)
+        await().atMost(60, TimeUnit.SECONDS).pollDelay(5, TimeUnit.SECONDS)
                 .untilAsserted(() -> assertTrue("File is not deleted", !file.exists()));
     }
 
@@ -103,20 +101,8 @@ void uploadBlob() throws IOException, InterruptedException, ParseException {
 
     }
 
-
     @AfterEach
     void cleanUp() throws IOException {
         FileUtils.forceDelete(file.getParentFile().getParentFile());
     }
 }
-
-
-
-
-
-
-
-
-
-
-