diff --git a/pom.xml b/pom.xml index e61d3af..b3acbce 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.vality service-parent-pom - 1.0.18 + 1.0.19 file-storage @@ -30,15 +30,11 @@ dev.vality file-storage-proto - 1.43-447212b + 1.44-1dbc006 dev.vality - damsel - - - dev.vality.woody - woody-thrift + msgpack-proto dev.vality.geck @@ -52,10 +48,6 @@ dev.vality.geck filter - - dev.vality - shared-resources - @@ -86,25 +78,12 @@ com.amazonaws aws-java-sdk-s3 - 1.12.259 - - - org.projectlombok - lombok - provided + 1.12.300 software.amazon.awssdk s3 - 2.17.230 - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus + 2.17.271 javax.servlet @@ -128,7 +107,7 @@ dev.vality testcontainers-annotations - 1.4.0 + 1.4.3 test diff --git a/src/main/java/dev/vality/file/storage/handler/FileStorageHandler.java b/src/main/java/dev/vality/file/storage/handler/FileStorageHandler.java index 2dc4142..f476c95 100644 --- a/src/main/java/dev/vality/file/storage/handler/FileStorageHandler.java +++ b/src/main/java/dev/vality/file/storage/handler/FileStorageHandler.java @@ -1,6 +1,5 @@ package dev.vality.file.storage.handler; -import dev.vality.damsel.msgpack.Value; import dev.vality.file.storage.FileData; import dev.vality.file.storage.FileNotFound; import dev.vality.file.storage.FileStorageSrv; @@ -10,6 +9,7 @@ import dev.vality.file.storage.service.exception.FileNotFoundException; import dev.vality.file.storage.service.exception.StorageException; import dev.vality.file.storage.util.CheckerUtil; import dev.vality.geck.common.util.TypeUtil; +import dev.vality.msgpack.Value; import dev.vality.woody.api.flow.error.WUnavailableResultException; import dev.vality.woody.api.flow.error.WUndefinedResultException; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/dev/vality/file/storage/service/S3Service.java b/src/main/java/dev/vality/file/storage/service/S3Service.java index e09b2e0..5ca9e79 100644 --- a/src/main/java/dev/vality/file/storage/service/S3Service.java +++ b/src/main/java/dev/vality/file/storage/service/S3Service.java @@ -6,7 +6,6 @@ import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.*; import com.amazonaws.services.s3.transfer.TransferManager; import com.amazonaws.services.s3.transfer.Upload; -import dev.vality.damsel.msgpack.Value; import dev.vality.file.storage.FileData; import dev.vality.file.storage.NewFileResult; import dev.vality.file.storage.configuration.properties.S3Properties; @@ -15,6 +14,7 @@ import dev.vality.file.storage.service.exception.FileNotFoundException; import dev.vality.file.storage.service.exception.StorageException; import dev.vality.file.storage.service.exception.WaitingUploadException; import dev.vality.file.storage.util.DamselUtil; +import dev.vality.msgpack.Value; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; diff --git a/src/main/java/dev/vality/file/storage/service/S3V2Service.java b/src/main/java/dev/vality/file/storage/service/S3V2Service.java index 61e8219..63f45e4 100644 --- a/src/main/java/dev/vality/file/storage/service/S3V2Service.java +++ b/src/main/java/dev/vality/file/storage/service/S3V2Service.java @@ -1,12 +1,12 @@ package dev.vality.file.storage.service; -import dev.vality.damsel.msgpack.Value; import dev.vality.file.storage.FileData; import dev.vality.file.storage.NewFileResult; import dev.vality.file.storage.configuration.properties.S3SdkV2Properties; import dev.vality.file.storage.service.exception.FileNotFoundException; import dev.vality.file.storage.service.exception.StorageException; import dev.vality.file.storage.util.DamselUtil; +import dev.vality.msgpack.Value; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; diff --git a/src/main/java/dev/vality/file/storage/service/StorageService.java b/src/main/java/dev/vality/file/storage/service/StorageService.java index d8c00dc..3acd0ef 100644 --- a/src/main/java/dev/vality/file/storage/service/StorageService.java +++ b/src/main/java/dev/vality/file/storage/service/StorageService.java @@ -1,8 +1,8 @@ package dev.vality.file.storage.service; -import dev.vality.damsel.msgpack.Value; import dev.vality.file.storage.FileData; import dev.vality.file.storage.NewFileResult; +import dev.vality.msgpack.Value; import java.net.URL; import java.time.Instant; diff --git a/src/test/java/dev/vality/file/storage/FileStorageTest.java b/src/test/java/dev/vality/file/storage/FileStorageTest.java index 181a59b..4b7ea80 100644 --- a/src/test/java/dev/vality/file/storage/FileStorageTest.java +++ b/src/test/java/dev/vality/file/storage/FileStorageTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static dev.vality.damsel.msgpack.Value.*; +import static dev.vality.msgpack.Value.*; import static dev.vality.testcontainers.annotations.util.ValuesGenerator.*; import static org.junit.jupiter.api.Assertions.*; @@ -59,9 +59,9 @@ public abstract class FileStorageTest { @Test public void fileUploadWithHttpClientBuilderTest() throws IOException, URISyntaxException, TException { String expirationTime = generateCurrentTimePlusDay().toString(); - Map metadata = new HashMap<>(); - metadata.put("author", dev.vality.damsel.msgpack.Value.str("Mary Doe")); - metadata.put("version", dev.vality.damsel.msgpack.Value.str("1.0.0.0")); + Map metadata = new HashMap<>(); + metadata.put("author", dev.vality.msgpack.Value.str("Mary Doe")); + metadata.put("version", dev.vality.msgpack.Value.str("1.0.0.0")); NewFileResult fileResult = fileStorageClient.createNewFile(metadata, expirationTime); @@ -94,9 +94,9 @@ public abstract class FileStorageTest { try { // создание нового файла String expirationTime = generateCurrentTimePlusDay().toString(); - Map metadata = new HashMap<>(); - metadata.put("author", dev.vality.damsel.msgpack.Value.str("Mary Doe")); - metadata.put("version", dev.vality.damsel.msgpack.Value.str("1.0.0.0")); + Map metadata = new HashMap<>(); + metadata.put("author", dev.vality.msgpack.Value.str("Mary Doe")); + metadata.put("version", dev.vality.msgpack.Value.str("1.0.0.0")); NewFileResult fileResult = fileStorageClient.createNewFile(metadata, expirationTime); uploadTestData(fileResult, FILE_NAME, FILE_DATA);