You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/09/12 16:17:30 UTC
(commons-vfs) branch master updated (9703fdb9 -> e3e5edb8)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
from 9703fdb9 Bump actions/upload-artifact from 4.3.6 to 4.4.0 (#596)
new 5790c370 Convert cascading if-else to switch
new 7a41d30a Use for each
new e3e5edb8 Use Collections.sort(List)
The 3 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.
Summary of changes:
.../vfs2/provider/mime/MimeAttributesMap.java | 7 ++-----
.../commons/vfs2/provider/AbstractFileName.java | 23 +++++++++++-----------
.../org/apache/commons/vfs2/ProviderReadTests.java | 3 ++-
3 files changed, 15 insertions(+), 18 deletions(-)
(commons-vfs) 02/03: Use for each
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
commit 7a41d30a167bf0d305d743f30803905a40c0bff5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 12:17:06 2024 -0400
Use for each
---
.../org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java
index 33ca961f..5914163e 100644
--- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java
+++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java
@@ -23,9 +23,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
@@ -120,10 +120,7 @@ public class MimeAttributesMap implements Map<String, Object> {
}
}
- // add all simple get/is results (with obj. prefix)
- final Iterator<Entry<String, Method>> iterEntries = mimeMessageGetters.entrySet().iterator();
- while (iterEntries.hasNext()) {
- final Map.Entry<String, Method> entry = iterEntries.next();
+ for (final Entry<String, Method> entry : mimeMessageGetters.entrySet()) {
final String name = entry.getKey();
final Method method = entry.getValue();
(commons-vfs) 01/03: Convert cascading if-else to switch
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
commit 5790c370e874d3c3fc8f8f0149107f9208626f28
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 12:16:25 2024 -0400
Convert cascading if-else to switch
---
.../commons/vfs2/provider/AbstractFileName.java | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
index 45e1b9cf..1975a46c 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
@@ -55,26 +55,25 @@ public abstract class AbstractFileName implements FileName {
// All good
return true;
}
-
if (!path.startsWith(basePath)) {
return false;
}
-
int baseLen = basePath.length();
if (VFS.isUriStyle()) {
// strip the trailing "/"
baseLen--;
}
-
- if (scope == NameScope.CHILD) {
- return path.length() != baseLen && (baseLen <= 1 || path.charAt(baseLen) == SEPARATOR_CHAR)
- && path.indexOf(SEPARATOR_CHAR, baseLen + 1) == -1;
- }
- if (scope == NameScope.DESCENDENT) {
- return path.length() != baseLen && (baseLen <= 1 || path.charAt(baseLen) == SEPARATOR_CHAR);
- }
- if (scope == NameScope.DESCENDENT_OR_SELF) {
- return baseLen <= 1 || path.length() <= baseLen || path.charAt(baseLen) == SEPARATOR_CHAR;
+ if (scope != null) {
+ switch (scope) {
+ case CHILD:
+ return path.length() != baseLen && (baseLen <= 1 || path.charAt(baseLen) == SEPARATOR_CHAR) && path.indexOf(SEPARATOR_CHAR, baseLen + 1) == -1;
+ case DESCENDENT:
+ return path.length() != baseLen && (baseLen <= 1 || path.charAt(baseLen) == SEPARATOR_CHAR);
+ case DESCENDENT_OR_SELF:
+ return baseLen <= 1 || path.length() <= baseLen || path.charAt(baseLen) == SEPARATOR_CHAR;
+ default:
+ break;
+ }
}
throw new IllegalArgumentException();
}
(commons-vfs) 03/03: Use Collections.sort(List)
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
commit e3e5edb86115a84a703e28fc3ef0389d33d8b20c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 12:17:25 2024 -0400
Use Collections.sort(List)
---
.../src/test/java/org/apache/commons/vfs2/ProviderReadTests.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java
index 6834991c..a02f42b7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java
@@ -21,6 +21,7 @@ import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.junit.Test;
@@ -318,7 +319,7 @@ public class ProviderReadTests extends AbstractProviderTestCase {
// Compare actual and expected list of files
final List<FileObject> expectedFiles = selector.finish();
- expectedFiles.sort(null);
+ Collections.sort(expectedFiles);
assertEquals(expectedFiles.size(), actualFiles.length);
final int count = expectedFiles.size();
for (int i = 0; i < count; i++) {