Browse Source

Pull request #804: REPORT-112857 fix: 改下isDir的写法

Merge in PG/plugin-repository-s3 from ~AFLY/plugin-repository-s3:release/11.0 to release/11.0

* commit 'f0809bb51642a2f61e16d3b89fb1558525c585b0':
  REPORT-112857 fix: 改下isDir的写法
  REPORT-112857 fix: 改下isDir的写法
release/11.0
Afly-储泓飞 1 year ago
parent
commit
b3caf72fb9
  1. 13
      src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java

13
src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java

@ -412,16 +412,11 @@ public class S3ResourceRepository extends BaseResourceRepository {
@Override
public boolean isDirectory(String path) {
if (path.endsWith(DELIMITER)) {
return exist(path);
if (!path.endsWith(DELIMITER) && fileExist(path)) {
//是文件
return false;
} else {
ObjectListing listing = s3.listObjects(bucket, path);
List<S3ObjectSummary> objectSummaries = listing.getObjectSummaries();
if (objectSummaries.isEmpty()) {
return false;
}
String dirFormat = path + DELIMITER;
return objectSummaries.stream().anyMatch(s3ObjectSummary -> StringUtils.equals(s3ObjectSummary.getKey(), dirFormat));
return dirExist(path) || isParentPathAbsent(path);
}
}

Loading…
Cancel
Save