Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement empty directory copy #385

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Implement empty directory copy #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
878c72c
Implement copying directories.
Jun 27, 2019
498e809
Add unit test
ennoruijters Sep 29, 2021
5d92872
Code style fixes
carlspring Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 34 additions & 22 deletions src/main/java/org/carlspring/cloud/storage/s3fs/S3FileSystemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,35 +855,46 @@ public void copy(Path source,

S3Path s3Source = toS3Path(source);
S3Path s3Target = toS3Path(target);
// TODO: implements support for copying directories

Preconditions.checkArgument(!Files.isDirectory(source), "copying directories is not yet supported: %s", source);
Preconditions.checkArgument(!Files.isDirectory(target), "copying directories is not yet supported: %s", target);

ImmutableSet<CopyOption> actualOptions = ImmutableSet.copyOf(options);
verifySupportedOptions(EnumSet.of(StandardCopyOption.REPLACE_EXISTING), actualOptions);

if (exists(s3Target) && !actualOptions.contains(StandardCopyOption.REPLACE_EXISTING))
if (exists(s3Target))
{
throw new FileAlreadyExistsException(format("target already exists: %s", target));
}

String bucketNameOrigin = s3Source.getFileStore().name();
String keySource = s3Source.getKey();
String bucketNameTarget = s3Target.getFileStore().name();
String keyTarget = s3Target.getKey();
final S3Client client = s3Source.getFileSystem().getClient();

final String encodedUrl = encodeUrl(bucketNameOrigin, keySource);
if (!actualOptions.contains(StandardCopyOption.REPLACE_EXISTING))
{
throw new FileAlreadyExistsException(format("target already exists: %s", target));
}

final CopyObjectRequest request = CopyObjectRequest.builder()
.copySource(encodedUrl)
.cacheControl(s3Target.getFileSystem().getRequestHeaderCacheControlProperty())
.destinationBucket(bucketNameTarget)
.destinationKey(keyTarget)
.build();
if (Files.isDirectory(source))
{
delete(s3Target);
}
}

client.copyObject(request);
if (Files.isDirectory(source))
{
createDirectory(s3Target);
}
else
{
String bucketNameOrigin = s3Source.getFileStore().name();
String keySource = s3Source.getKey();
String bucketNameTarget = s3Target.getFileStore().name();
String keyTarget = s3Target.getKey();
final S3Client client = s3Source.getFileSystem().getClient();

final String encodedUrl = encodeUrl(bucketNameOrigin, keySource);

final CopyObjectRequest request = CopyObjectRequest.builder()
.copySource(encodedUrl)
.cacheControl(s3Target.getFileSystem().getRequestHeaderCacheControlProperty())
.destinationBucket(bucketNameTarget)
.destinationKey(keyTarget)
.build();

client.copyObject(request);
}
}

private String encodeUrl(final String bucketNameOrigin,
Expand All @@ -899,6 +910,7 @@ private String encodeUrl(final String bucketNameOrigin,
{
throw new UnsupportedEncodingException("URL could not be encoded: " + e.getMessage());
}

return encodedUrl;
}

Expand Down
32 changes: 32 additions & 0 deletions src/test/java/org/carlspring/cloud/storage/s3fs/fileSystemProvider/CopyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -126,6 +127,37 @@ void copyAlreadyExists()
assertNotNull(exception);
}

@Test
public void copyDirectory() throws IOException
{
final String content = "sample-content";

// fixtures
S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket("bucketA").dir("dir1").file("dir1/file", content.getBytes());
FileSystem fs = createNewS3FileSystem();
Path dir1 = fs.getPath("/bucketA", "dir1");
Path file1 = fs.getPath("/bucketA", "dir1", "file");
Path dir2 = fs.getPath("/bucketA", "dir2");
Path file2 = fs.getPath("/bucketA", "dir2", "file");

// assert
assertTrue(Files.exists(dir1));
assertTrue(Files.exists(file1));
assertTrue(Files.isDirectory(dir1));
assertTrue(Files.isRegularFile(file1));
assertFalse(Files.exists(dir2));
assertFalse(Files.exists(file2));

// act
s3fsProvider.copy(dir1, dir2);

// assertions
assertTrue(Files.exists(dir2));
assertTrue(Files.isDirectory(dir2));
assertFalse(Files.exists(file2));
}

/**
* create a new file system for s3 scheme with fake credentials
* and global endpoint
Expand Down