diff --git a/minio-local-cluster/minio-cluster.yml b/minio-local-cluster/minio-cluster.yml
index 93a2d83..53a95a1 100644
--- a/minio-local-cluster/minio-cluster.yml
+++ b/minio-local-cluster/minio-cluster.yml
@@ -11,7 +11,7 @@ x-minio-common: &minio-common
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio123
healthcheck:
- test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
+ test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
interval: 30s
timeout: 20s
retries: 3
diff --git a/minio-local-cluster/minio.yml b/minio-local-cluster/minio.yml
index 91487b9..b6bb0c4 100644
--- a/minio-local-cluster/minio.yml
+++ b/minio-local-cluster/minio.yml
@@ -12,7 +12,7 @@ services:
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio123
healthcheck:
- test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
+ test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
interval: 30s
timeout: 20s
retries: 3
diff --git a/pom.xml b/pom.xml
index 413437f..7cd04e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,11 @@
dev.vality
file-storage-proto
- 1.33-86bcf44
+ 1.41-89c2d94
+
+
+ dev.vality
+ damsel
dev.vality.woody
@@ -144,22 +148,6 @@
org.springframework.boot
spring-boot-maven-plugin
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- -Dfile.encoding=UTF-8
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
-
-
- p12
-
-
-
org.apache.maven.plugins
maven-remote-resources-plugin
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 e2bd07e..2dc4142 100644
--- a/src/main/java/dev/vality/file/storage/handler/FileStorageHandler.java
+++ b/src/main/java/dev/vality/file/storage/handler/FileStorageHandler.java
@@ -1,10 +1,10 @@
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;
import dev.vality.file.storage.NewFileResult;
-import dev.vality.file.storage.msgpack.Value;
import dev.vality.file.storage.service.StorageService;
import dev.vality.file.storage.service.exception.FileNotFoundException;
import dev.vality.file.storage.service.exception.StorageException;
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 72fa9bd..e09b2e0 100644
--- a/src/main/java/dev/vality/file/storage/service/S3Service.java
+++ b/src/main/java/dev/vality/file/storage/service/S3Service.java
@@ -6,10 +6,10 @@ 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;
-import dev.vality.file.storage.msgpack.Value;
import dev.vality.file.storage.service.exception.ExtractMetadataException;
import dev.vality.file.storage.service.exception.FileNotFoundException;
import dev.vality.file.storage.service.exception.StorageException;
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 90f3d1c..33eb1b3 100644
--- a/src/main/java/dev/vality/file/storage/service/S3V2Service.java
+++ b/src/main/java/dev/vality/file/storage/service/S3V2Service.java
@@ -1,9 +1,9 @@
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.msgpack.Value;
import dev.vality.file.storage.service.exception.FileNotFoundException;
import dev.vality.file.storage.service.exception.StorageException;
import dev.vality.file.storage.util.DamselUtil;
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 1c8a0de..d8c00dc 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.file.storage.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 8386bce..181a59b 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.file.storage.msgpack.Value.*;
+import static dev.vality.damsel.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.file.storage.msgpack.Value.str("Mary Doe"));
- metadata.put("version", dev.vality.file.storage.msgpack.Value.str("1.0.0.0"));
+ 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"));
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.file.storage.msgpack.Value.str("Mary Doe"));
- metadata.put("version", dev.vality.file.storage.msgpack.Value.str("1.0.0.0"));
+ 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"));
NewFileResult fileResult = fileStorageClient.createNewFile(metadata, expirationTime);
uploadTestData(fileResult, FILE_NAME, FILE_DATA);
diff --git a/src/test/java/dev/vality/file/storage/awssdks3v2/WithCeph.java b/src/test/java/dev/vality/file/storage/awssdks3v2/WithCephTest.java
similarity index 85%
rename from src/test/java/dev/vality/file/storage/awssdks3v2/WithCeph.java
rename to src/test/java/dev/vality/file/storage/awssdks3v2/WithCephTest.java
index 28e34a6..064f4b2 100644
--- a/src/test/java/dev/vality/file/storage/awssdks3v2/WithCeph.java
+++ b/src/test/java/dev/vality/file/storage/awssdks3v2/WithCephTest.java
@@ -6,5 +6,5 @@ import dev.vality.testcontainers.annotations.ceph.CephTestcontainerSingleton;
@CephTestcontainerSingleton(
properties = {"s3-sdk-v2.enabled=true", "s3-sdk-v2.region=us-east-1"},
bucketName = "awssdks3v2")
-public class WithCeph extends FileStorageTest {
+public class WithCephTest extends FileStorageTest {
}
diff --git a/src/test/java/dev/vality/file/storage/awssdks3v2/WithMinio.java b/src/test/java/dev/vality/file/storage/awssdks3v2/WithMinioTest.java
similarity index 84%
rename from src/test/java/dev/vality/file/storage/awssdks3v2/WithMinio.java
rename to src/test/java/dev/vality/file/storage/awssdks3v2/WithMinioTest.java
index ca3c4c7..ea51baf 100644
--- a/src/test/java/dev/vality/file/storage/awssdks3v2/WithMinio.java
+++ b/src/test/java/dev/vality/file/storage/awssdks3v2/WithMinioTest.java
@@ -6,5 +6,5 @@ import dev.vality.testcontainers.annotations.minio.MinioTestcontainerSingleton;
@MinioTestcontainerSingleton(
properties = "s3-sdk-v2.enabled=true",
bucketName = "awssdks3v2")
-public class WithMinio extends FileStorageTest {
+public class WithMinioTest extends FileStorageTest {
}
diff --git a/src/test/java/dev/vality/file/storage/s3signer/WithCeph.java b/src/test/java/dev/vality/file/storage/s3signer/WithCephTest.java
similarity index 81%
rename from src/test/java/dev/vality/file/storage/s3signer/WithCeph.java
rename to src/test/java/dev/vality/file/storage/s3signer/WithCephTest.java
index e099a9a..e0afa9a 100644
--- a/src/test/java/dev/vality/file/storage/s3signer/WithCeph.java
+++ b/src/test/java/dev/vality/file/storage/s3signer/WithCephTest.java
@@ -4,5 +4,5 @@ import dev.vality.file.storage.FileStorageTest;
import dev.vality.testcontainers.annotations.ceph.CephTestcontainerSingleton;
@CephTestcontainerSingleton(bucketName = "s3signer")
-public class WithCeph extends FileStorageTest {
+public class WithCephTest extends FileStorageTest {
}
diff --git a/src/test/java/dev/vality/file/storage/s3signer/WithMinio.java b/src/test/java/dev/vality/file/storage/s3signer/WithMinioTest.java
similarity index 81%
rename from src/test/java/dev/vality/file/storage/s3signer/WithMinio.java
rename to src/test/java/dev/vality/file/storage/s3signer/WithMinioTest.java
index d1a941f..4f9cfaa 100644
--- a/src/test/java/dev/vality/file/storage/s3signer/WithMinio.java
+++ b/src/test/java/dev/vality/file/storage/s3signer/WithMinioTest.java
@@ -4,5 +4,5 @@ import dev.vality.file.storage.FileStorageTest;
import dev.vality.testcontainers.annotations.minio.MinioTestcontainerSingleton;
@MinioTestcontainerSingleton(bucketName = "s3signer")
-public class WithMinio extends FileStorageTest {
+public class WithMinioTest extends FileStorageTest {
}
diff --git a/src/test/java/dev/vality/file/storage/s3v4signer/WithCeph.java b/src/test/java/dev/vality/file/storage/s3v4signer/WithCephTest.java
similarity index 85%
rename from src/test/java/dev/vality/file/storage/s3v4signer/WithCeph.java
rename to src/test/java/dev/vality/file/storage/s3v4signer/WithCephTest.java
index 9079075..b4acc7a 100644
--- a/src/test/java/dev/vality/file/storage/s3v4signer/WithCeph.java
+++ b/src/test/java/dev/vality/file/storage/s3v4signer/WithCephTest.java
@@ -6,5 +6,5 @@ import dev.vality.testcontainers.annotations.ceph.CephTestcontainerSingleton;
@CephTestcontainerSingleton(
properties = "s3.signer-override=AWSS3V4SignerType",
bucketName = "s3v4signer")
-public class WithCeph extends FileStorageTest {
+public class WithCephTest extends FileStorageTest {
}
diff --git a/src/test/java/dev/vality/file/storage/s3v4signer/WithMinio.java b/src/test/java/dev/vality/file/storage/s3v4signer/WithMinioTest.java
similarity index 85%
rename from src/test/java/dev/vality/file/storage/s3v4signer/WithMinio.java
rename to src/test/java/dev/vality/file/storage/s3v4signer/WithMinioTest.java
index 78fafa3..5590ce5 100644
--- a/src/test/java/dev/vality/file/storage/s3v4signer/WithMinio.java
+++ b/src/test/java/dev/vality/file/storage/s3v4signer/WithMinioTest.java
@@ -6,5 +6,5 @@ import dev.vality.testcontainers.annotations.minio.MinioTestcontainerSingleton;
@MinioTestcontainerSingleton(
properties = "s3.signer-override=AWSS3V4SignerType",
bucketName = "s3v4signer")
-public class WithMinio extends FileStorageTest {
+public class WithMinioTest extends FileStorageTest {
}
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..4d952e8
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+