mirror of
https://github.com/valitydev/file-storage.git
synced 2024-11-06 00:35:22 +00:00
Update all non-major dependencies (#8)
* replace damsel on msgpack-proto Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Anatoly Karlov <karleowne@gmail.com>
This commit is contained in:
renovate[bot]
GitHub
parent
3d43f194ab
commit
34161553d2
33
pom.xml
33
pom.xml
@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>dev.vality</groupId>
|
||||
<artifactId>service-parent-pom</artifactId>
|
||||
<version>1.0.18</version>
|
||||
<version>1.0.19</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>file-storage</artifactId>
|
||||
@ -30,15 +30,11 @@
|
||||
<dependency>
|
||||
<groupId>dev.vality</groupId>
|
||||
<artifactId>file-storage-proto</artifactId>
|
||||
<version>1.43-447212b</version>
|
||||
<version>1.44-1dbc006</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>dev.vality</groupId>
|
||||
<artifactId>damsel</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>dev.vality.woody</groupId>
|
||||
<artifactId>woody-thrift</artifactId>
|
||||
<artifactId>msgpack-proto</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>dev.vality.geck</groupId>
|
||||
@ -52,10 +48,6 @@
|
||||
<groupId>dev.vality.geck</groupId>
|
||||
<artifactId>filter</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>dev.vality</groupId>
|
||||
<artifactId>shared-resources</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring libs -->
|
||||
<dependency>
|
||||
@ -86,25 +78,12 @@
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-s3</artifactId>
|
||||
<version>1.12.259</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<scope>provided</scope>
|
||||
<version>1.12.300</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>software.amazon.awssdk</groupId>
|
||||
<artifactId>s3</artifactId>
|
||||
<version>2.17.230</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-prometheus</artifactId>
|
||||
<version>2.17.271</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
@ -128,7 +107,7 @@
|
||||
<dependency>
|
||||
<groupId>dev.vality</groupId>
|
||||
<artifactId>testcontainers-annotations</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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<String, dev.vality.damsel.msgpack.Value> 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<String, dev.vality.msgpack.Value> 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<String, dev.vality.damsel.msgpack.Value> 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<String, dev.vality.msgpack.Value> 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);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user