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 2021/11/27 03:27:21 UTC
[commons-vfs] 02/08: Fix PMD UselessParentheses.
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 0817f0e67fabe8ae46eb7fa6a9d8ecb0941dab9b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 26 21:08:14 2021 -0500
Fix PMD UselessParentheses.
---
.../org/apache/commons/vfs2/impl/DefaultFileSystemManager.java | 2 +-
.../main/java/org/apache/commons/vfs2/provider/UriParser.java | 10 +++++-----
.../org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java | 2 +-
.../commons/vfs2/provider/ram/RamFileRandomAccessContent.java | 6 +++---
.../main/java/org/apache/commons/vfs2/tasks/DeleteTask.java | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
index 4cea992..3798867 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
@@ -911,7 +911,7 @@ public class DefaultFileSystemManager implements FileSystemManager {
String scheme = UriParser.extractScheme(getSchemes(), buffer.toString());
// Determine whether to prepend the base path
- if (name.isEmpty() || (scheme == null && buffer.charAt(0) != FileName.SEPARATOR_CHAR)) {
+ if (name.isEmpty() || scheme == null && buffer.charAt(0) != FileName.SEPARATOR_CHAR) {
// Supplied path is not absolute
if (!VFS.isUriStyle()) {
// when using URIs the parent already do have the trailing "/"
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
index d321e59..6dd9984 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
@@ -102,7 +102,7 @@ public final class UriParser {
count -= 2;
} else if (fileNameParser.encodeCharacter(ch)) {
// Encode
- final char[] digits = { Character.forDigit((ch >> BITS_IN_HALF_BYTE) & LOW_MASK, HEX_BASE),
+ final char[] digits = { Character.forDigit(ch >> BITS_IN_HALF_BYTE & LOW_MASK, HEX_BASE),
Character.forDigit(ch & LOW_MASK, HEX_BASE) };
buffer.setCharAt(index, '%');
buffer.insert(index + 1, digits);
@@ -244,7 +244,7 @@ public final class UriParser {
}
if (match) {
// Encode
- final char[] digits = { Character.forDigit((ch >> BITS_IN_HALF_BYTE) & LOW_MASK, HEX_BASE),
+ final char[] digits = { Character.forDigit(ch >> BITS_IN_HALF_BYTE & LOW_MASK, HEX_BASE),
Character.forDigit(ch & LOW_MASK, HEX_BASE) };
buffer.setCharAt(index, '%');
buffer.insert(index + 1, digits);
@@ -260,7 +260,7 @@ public final class UriParser {
final char ch = buffer.charAt(index);
if (Arrays.binarySearch(allowed, ch) < 0) {
// Encode
- final char[] digits = {Character.forDigit((ch >> BITS_IN_HALF_BYTE) & LOW_MASK, HEX_BASE), Character.forDigit(ch & LOW_MASK, HEX_BASE)};
+ final char[] digits = {Character.forDigit(ch >> BITS_IN_HALF_BYTE & LOW_MASK, HEX_BASE), Character.forDigit(ch & LOW_MASK, HEX_BASE)};
buffer.setCharAt(index, '%');
buffer.insert(index + 1, digits);
index += 2;
@@ -411,11 +411,11 @@ public final class UriParser {
return scheme.intern();
}
- if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
+ if (ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z') {
// A scheme character
continue;
}
- if (pos > 0 && ((ch >= '0' && ch <= '9') || ch == '+' || ch == '-' || ch == '.')) {
+ if (pos > 0 && (ch >= '0' && ch <= '9' || ch == '+' || ch == '-' || ch == '.')) {
// A scheme character (these are not allowed as the first
// character of the scheme, but can be used as subsequent
// characters.
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
index a61a51d..4328d45 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
@@ -209,7 +209,7 @@ public final class FtpClientFactory {
}
final Boolean userDirIsRoot = builder.getUserDirIsRoot(fileSystemOptions);
- if ((workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue())) && !client.changeWorkingDirectory(workingDirectory)) {
+ if (workingDirectory != null && (userDirIsRoot == null || !userDirIsRoot.booleanValue()) && !client.changeWorkingDirectory(workingDirectory)) {
throw new FileSystemException("vfs.provider.ftp/change-work-directory.error",
workingDirectory);
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
index 8915554..e2e24b2 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContent.java
@@ -383,9 +383,9 @@ public class RamFileRandomAccessContent implements RandomAccessContent {
* @return A long.
*/
public static long toLong(final byte[] b) {
- return ((((long) b[7]) & BYTE_VALUE_MASK) + ((((long) b[6]) & BYTE_VALUE_MASK) << 8) + ((((long) b[5]) & BYTE_VALUE_MASK) << 16)
+ return (((long) b[7]) & BYTE_VALUE_MASK) + ((((long) b[6]) & BYTE_VALUE_MASK) << 8) + ((((long) b[5]) & BYTE_VALUE_MASK) << 16)
+ ((((long) b[4]) & BYTE_VALUE_MASK) << 24) + ((((long) b[3]) & BYTE_VALUE_MASK) << 32) + ((((long) b[2]) & BYTE_VALUE_MASK) << 40)
- + ((((long) b[1]) & BYTE_VALUE_MASK) << 48) + ((((long) b[0]) & BYTE_VALUE_MASK) << 56));
+ + ((((long) b[1]) & BYTE_VALUE_MASK) << 48) + ((((long) b[0]) & BYTE_VALUE_MASK) << 56);
}
/**
@@ -431,7 +431,7 @@ public class RamFileRandomAccessContent implements RandomAccessContent {
* @return A short.
*/
public static int toUnsignedShort(final byte[] b) {
- return ((b[1] & BYTE_VALUE_MASK) + ((b[0] & BYTE_VALUE_MASK) << 8));
+ return (b[1] & BYTE_VALUE_MASK) + ((b[0] & BYTE_VALUE_MASK) << 8);
}
/*
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
index f45c1ff..965d1bc 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
@@ -67,7 +67,7 @@ public class DeleteTask extends VfsTask {
*/
@Override
public void execute() throws BuildException {
- if ((srcDirUrl == null ? file == null : filesList == null)) {
+ if (srcDirUrl == null ? file == null : filesList == null) {
final String message = Messages.getString("vfs.tasks/delete.no-source-files.error");
throw new BuildException(message);
}