From fb5909b802a33ffbac8f3a3dc6b5cc9402bed90f Mon Sep 17 00:00:00 2001 From: Esko Suomi Date: Mon, 14 Oct 2024 12:33:57 +0300 Subject: [PATCH] fix prettier formatting which got overridden by idea during commit --- .../java/no/entur/uttu/export/ExportService.java | 11 +++++------ .../uttu/export/blob/S3BlobStoreRepository.java | 15 +++++++-------- .../export/blob/S3BlobStoreRepositoryTest.java | 9 ++++----- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/main/java/no/entur/uttu/export/ExportService.java b/src/main/java/no/entur/uttu/export/ExportService.java index 1c8e5cf9..b936581e 100644 --- a/src/main/java/no/entur/uttu/export/ExportService.java +++ b/src/main/java/no/entur/uttu/export/ExportService.java @@ -15,6 +15,11 @@ package no.entur.uttu.export; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.List; +import java.util.Map; +import java.util.Optional; import no.entur.uttu.error.codedexception.CodedIllegalArgumentException; import no.entur.uttu.export.linestatistics.ExportedLineStatisticsService; import no.entur.uttu.export.messaging.spi.MessagingService; @@ -33,12 +38,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.List; -import java.util.Map; -import java.util.Optional; - @Component public class ExportService { diff --git a/src/main/java/no/entur/uttu/export/blob/S3BlobStoreRepository.java b/src/main/java/no/entur/uttu/export/blob/S3BlobStoreRepository.java index 1dc09db8..1391792b 100644 --- a/src/main/java/no/entur/uttu/export/blob/S3BlobStoreRepository.java +++ b/src/main/java/no/entur/uttu/export/blob/S3BlobStoreRepository.java @@ -1,5 +1,12 @@ package no.entur.uttu.export.blob; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.function.Function; import org.rutebanken.helper.storage.BlobAlreadyExistsException; import org.rutebanken.helper.storage.BlobStoreException; import org.rutebanken.helper.storage.model.BlobDescriptor; @@ -13,14 +20,6 @@ import software.amazon.awssdk.services.s3.model.S3Object; import software.amazon.awssdk.services.s3.paginators.ListObjectsV2Iterable; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.function.Function; - /** * AWS S3 backed implementation of {@link BlobStoreRepository}. */ diff --git a/src/test/java/no/entur/uttu/export/blob/S3BlobStoreRepositoryTest.java b/src/test/java/no/entur/uttu/export/blob/S3BlobStoreRepositoryTest.java index 0c894fa6..aa940525 100644 --- a/src/test/java/no/entur/uttu/export/blob/S3BlobStoreRepositoryTest.java +++ b/src/test/java/no/entur/uttu/export/blob/S3BlobStoreRepositoryTest.java @@ -1,5 +1,9 @@ package no.entur.uttu.export.blob; +import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; +import java.util.Map; +import java.util.Optional; import no.entur.uttu.UttuIntegrationTest; import org.jetbrains.annotations.NotNull; import org.junit.Assert; @@ -22,11 +26,6 @@ import software.amazon.awssdk.services.s3.model.NoSuchBucketException; import software.amazon.awssdk.services.s3.model.NoSuchKeyException; -import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; -import java.util.Map; -import java.util.Optional; - @Testcontainers @ActiveProfiles({ "s3-blobstore" }) public class S3BlobStoreRepositoryTest extends UttuIntegrationTest {