You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/09/23 08:20:42 UTC
[incubator-dlab] branch DLAB-1344 created (now 457de16)
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a change to branch DLAB-1344
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 457de16 [DLAB-1344] Added localization support
This branch includes the following new commits:
new 457de16 [DLAB-1344] Added localization support
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1344] Added localization support
Posted by of...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1344
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 457de160b49a7f37d3a63dc4f6f0db94cc7977ef
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed Sep 23 11:16:29 2020 +0300
[DLAB-1344] Added localization support
---
.../src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java | 2 +-
.../java/com/epam/dlab/backendapi/service/BucketService.java | 1 -
.../backendapi/service/impl/aws/BucketServiceAwsImpl.java | 12 ++++--------
.../service/impl/azure/BucketServiceAzureImpl.java | 5 ++---
.../backendapi/service/impl/gcp/BucketServiceGcpImpl.java | 6 +-----
.../dlab/backendapi/service/impl/BucketServiceImplTest.java | 4 +++-
6 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java
index 369c866..74e0a8b 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java
@@ -30,5 +30,5 @@ public class BucketDTO {
private final String bucket;
private final String object;
private final String size;
- private final String lastModifiedDate;
+ private final long lastModifiedDate;
}
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
index 47b001b..de77e93 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
@@ -27,7 +27,6 @@ import java.io.InputStream;
import java.util.List;
public interface BucketService {
- String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
List<BucketDTO> getObjects(String bucket);
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
index 6c5673d..1657677 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
@@ -38,8 +38,6 @@ import software.amazon.awssdk.services.s3.model.S3Object;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -141,13 +139,11 @@ public class BucketServiceAwsImpl implements BucketService {
}
private BucketDTO toBucketDTO(String bucket, S3Object s3Object) {
- Date date = Date.from(s3Object.lastModified());
- SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
return BucketDTO.builder()
- .bucket(bucket)
- .object(s3Object.key())
- .size(String.valueOf(s3Object.size()))
- .lastModifiedDate(formatter.format(date))
+ .bucket(bucket)
+ .object(s3Object.key())
+ .size(String.valueOf(s3Object.size()))
+ .lastModifiedDate(s3Object.lastModified().toEpochMilli())
.build();
}
}
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
index 073aca2..6ee1089 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
@@ -44,12 +44,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@Slf4j
public class BucketServiceAzureImpl implements BucketService {
+
private final AzureAuthFile azureAuthFile;
@Inject
@@ -124,12 +124,11 @@ public class BucketServiceAzureImpl implements BucketService {
}
private BucketDTO toBucketDTO(String bucket, BlobItem blob) {
- String lastModifiedDate = blob.getProperties().getLastModified().format(DateTimeFormatter.ofPattern(DATE_FORMAT));
return BucketDTO.builder()
.bucket(bucket)
.object(blob.getName())
- .lastModifiedDate(lastModifiedDate)
.size(String.valueOf(blob.getProperties().getContentLength()))
+ .lastModifiedDate(blob.getProperties().getLastModified().toEpochSecond())
.build();
}
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java
index 4a28bf6..faf99a7 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java
@@ -34,8 +34,6 @@ import lombok.extern.slf4j.Slf4j;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
@@ -120,13 +118,11 @@ public class BucketServiceGcpImpl implements BucketService {
}
private BucketDTO toBucketDTO(BlobInfo blobInfo) {
- Date date = new Date(blobInfo.getUpdateTime());
- SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
return BucketDTO.builder()
.bucket(blobInfo.getBucket())
.object(blobInfo.getName())
.size(String.valueOf(blobInfo.getSize()))
- .lastModifiedDate(formatter.format(date))
+ .lastModifiedDate(blobInfo.getUpdateTime())
.build();
}
}
diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BucketServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BucketServiceImplTest.java
index 641100d..d34722f 100644
--- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BucketServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BucketServiceImplTest.java
@@ -42,6 +42,7 @@ import javax.ws.rs.core.Response;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.time.LocalDate;
import java.util.Collections;
import java.util.List;
@@ -58,6 +59,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class BucketServiceImplTest extends TestBase {
+
private static final String BUCKET_GET_OBJECTS = "%sbucket/%s";
private static final String BUCKET_UPLOAD_OBJECT = "%sbucket/upload";
private static final String BUCKET_UPLOAD_FOLDER = "%sbucket/folder/upload";
@@ -66,7 +68,7 @@ public class BucketServiceImplTest extends TestBase {
private static final String BUCKET = "bucket";
private static final String OBJECT = "object";
private static final String SIZE = "size";
- private static final String DATE = "date";
+ private static final long DATE = LocalDate.now().toEpochDay();
private static final String FOLDER = "folder/";
@Mock
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org