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/28 18:02:24 UTC
[commons-vfs] 02/02: Fix Checkstyle DeclarationOrder: Variable access definition in wrong order.
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 4bf580cb9d167dc467040e155659609f59c05522
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 28 13:02:17 2021 -0500
Fix Checkstyle DeclarationOrder: Variable access definition in wrong
order.
Class with package private visibility does not need to define public or
protected constants, these can be package private as well.
---
.../commons/vfs2/filter/CanWriteFileFilter.java | 4 +-
.../commons/vfs2/filter/DirectoryFileFilter.java | 4 +-
.../commons/vfs2/filter/EmptyFileFilter.java | 4 +-
.../commons/vfs2/filter/FalseFileFilter.java | 4 +-
.../apache/commons/vfs2/filter/FileFileFilter.java | 4 +-
.../commons/vfs2/filter/HiddenFileFilter.java | 4 +-
.../commons/vfs2/filter/RegexFileFilter.java | 4 +-
.../vfs2/filter/SymbolicLinkFileFilter.java | 4 +-
.../apache/commons/vfs2/filter/TrueFileFilter.java | 4 +-
.../commons/vfs2/provider/AbstractFileObject.java | 4 +-
.../commons/vfs2/provider/DefaultFileContent.java | 4 +-
.../vfs2/provider/ftp/FtpClientFactory.java | 4 +-
.../vfs2/provider/ftps/FtpsFileProvider.java | 2 +-
.../http4/Http4FileSystemConfigBuilder.java | 16 +--
.../http5/Http5FileSystemConfigBuilder.java | 16 +--
.../local/LocalFileRandomAccessContent.java | 4 +-
.../provider/ram/RamFileRandomAccessContent.java | 2 +-
.../provider/sftp/SftpFileSystemConfigBuilder.java | 43 +++----
.../org/apache/commons/vfs2/util/URIBitSets.java | 124 ++++++++++-----------
19 files changed, 130 insertions(+), 125 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java
index cada153..689e110 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/CanWriteFileFilter.java
@@ -66,14 +66,14 @@ import org.apache.commons.vfs2.FileSystemException;
*/
public class CanWriteFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/** Singleton instance of <i>writable</i> filter. */
public static final FileFilter CAN_WRITE = new CanWriteFileFilter();
/** Singleton instance of not <i>writable</i> filter. */
public static final FileFilter CANNOT_WRITE = new NotFileFilter(CAN_WRITE);
+ private static final long serialVersionUID = 1L;
+
/**
* Restrictive constructor.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/DirectoryFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/DirectoryFileFilter.java
index 9d7f208..fce90f4 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/DirectoryFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/DirectoryFileFilter.java
@@ -45,13 +45,13 @@ import org.apache.commons.vfs2.FileType;
*/
public class DirectoryFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/**
* Singleton instance of directory filter.
*/
public static final FileFilter DIRECTORY = new DirectoryFileFilter();
+ private static final long serialVersionUID = 1L;
+
/**
* Restrictive constructor.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
index d51514e..f53b941 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/EmptyFileFilter.java
@@ -62,14 +62,14 @@ import org.apache.commons.vfs2.FileType;
*/
public class EmptyFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/** Singleton instance of <i>empty</i> filter. */
public static final FileFilter EMPTY = new EmptyFileFilter();
/** Singleton instance of <i>not-empty</i> filter. */
public static final FileFilter NOT_EMPTY = new NotFileFilter(EMPTY);
+ private static final long serialVersionUID = 1L;
+
/**
* Restrictive constructor.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FalseFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FalseFileFilter.java
index c251af5..21dd2d8 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FalseFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FalseFileFilter.java
@@ -30,8 +30,6 @@ import org.apache.commons.vfs2.FileSelectInfo;
*/
public class FalseFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/**
* Singleton instance of false filter.
*
@@ -46,6 +44,8 @@ public class FalseFileFilter implements FileFilter, Serializable {
@Deprecated
public static final FileFilter FALSE = INSTANCE;
+ private static final long serialVersionUID = 1L;
+
/**
* Restrictive constructor.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FileFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FileFileFilter.java
index 88b4c85..ebfba5f 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FileFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/FileFileFilter.java
@@ -45,11 +45,11 @@ import org.apache.commons.vfs2.FileType;
*/
public class FileFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/** Singleton instance of file filter. */
public static final FileFilter FILE = new FileFileFilter();
+ private static final long serialVersionUID = 1L;
+
/**
* Restrictive constructor.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/HiddenFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/HiddenFileFilter.java
index f9f9698..0136054 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/HiddenFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/HiddenFileFilter.java
@@ -58,14 +58,14 @@ import org.apache.commons.vfs2.FileSystemException;
*/
public class HiddenFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/** Singleton instance of <i>hidden</i> filter. */
public static final FileFilter HIDDEN = new HiddenFileFilter();
/** Singleton instance of <i>visible</i> filter. */
public static final FileFilter VISIBLE = new NotFileFilter(HIDDEN);
+ private static final long serialVersionUID = 1L;
+
/**
* Restrictive constructor.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/RegexFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/RegexFileFilter.java
index 82f8aa9..f0ca89d 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/RegexFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/RegexFileFilter.java
@@ -48,11 +48,11 @@ import org.apache.commons.vfs2.FileSelectInfo;
*/
public class RegexFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/** Exception message when no pattern is given in the constructor. */
public static final String PATTERN_IS_MISSING = "Pattern is missing";
+ private static final long serialVersionUID = 1L;
+
/** The regular expression pattern that will be used to match file names. */
private final Pattern pattern;
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilter.java
index 3dd1d02..e524148 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilter.java
@@ -56,14 +56,14 @@ import org.apache.commons.vfs2.FileSystemException;
*/
public class SymbolicLinkFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/** Singleton instance of <i>hidden</i> filter. */
public static final FileFilter SYMBOLIC = new SymbolicLinkFileFilter();
/** Singleton instance of <i>visible</i> filter. */
public static final FileFilter ACTUAL = new NotFileFilter(SYMBOLIC);
+ private static final long serialVersionUID = 1L;
+
/**
* Restrictive constructor.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/TrueFileFilter.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/TrueFileFilter.java
index fd6fedb..377b6d3 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/TrueFileFilter.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/filter/TrueFileFilter.java
@@ -30,8 +30,6 @@ import org.apache.commons.vfs2.FileSelectInfo;
*/
public class TrueFileFilter implements FileFilter, Serializable {
- private static final long serialVersionUID = 1L;
-
/**
* Singleton instance of true filter.
*
@@ -39,6 +37,8 @@ public class TrueFileFilter implements FileFilter, Serializable {
*/
public static final FileFilter INSTANCE = new TrueFileFilter();
+ private static final long serialVersionUID = 1L;
+
/**
* Singleton instance of true filter.
*
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
index 116d7b2..6f66543 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
@@ -67,8 +67,6 @@ import org.apache.commons.vfs2.util.RandomAccessMode;
*/
public abstract class AbstractFileObject<AFS extends AbstractFileSystem> implements FileObject {
- private static final String DO_GET_INPUT_STREAM_INT = "doGetInputStream(int)";
-
/**
* Same as {@link BufferedInputStream}.
*/
@@ -76,6 +74,8 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
private static final int INITIAL_LIST_SIZE = 5;
+ private static final String DO_GET_INPUT_STREAM_INT = "doGetInputStream(int)";
+
private final AbstractFileName fileName;
private final AFS fileSystem;
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
index 7225d3b..b85d78b 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
@@ -208,9 +208,11 @@ public final class DefaultFileContent implements FileContent {
}
}
- private static final Certificate[] EMPTY_CERTIFICATE_ARRAY = {};
static final int STATE_CLOSED = 0;
static final int STATE_OPENED = 1;
+
+ private static final Certificate[] EMPTY_CERTIFICATE_ARRAY = {};
+
/**
* The default buffer size for {@link #write(OutputStream)}.
*/
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 db73c81..505dc9f 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
@@ -48,15 +48,17 @@ public final class FtpClientFactory {
* @param <B> The type of FtpFileSystemConfigBuilder
*/
public abstract static class ConnectionFactory<C extends FTPClient, B extends FtpFileSystemConfigBuilder> {
+
private static final char[] ANON_CHAR_ARRAY = "anonymous".toCharArray();
private static final int BUFSZ = 40;
- private final Log log = LogFactory.getLog(getClass());
/**
* My builder.
*/
protected B builder;
+ private final Log log = LogFactory.getLog(getClass());
+
/**
* Constructs a new instance.
*
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java
index d4ad7c3..09d73e4 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsFileProvider.java
@@ -33,7 +33,7 @@ import org.apache.commons.vfs2.provider.ftp.FtpFileProvider;
* @since 2.0
*/
public class FtpsFileProvider extends FtpFileProvider {
-
+
/**
* Constructs a new instance.
*/
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileSystemConfigBuilder.java
index 4366829..6ca3e73 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileSystemConfigBuilder.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileSystemConfigBuilder.java
@@ -33,6 +33,14 @@ import org.apache.http.cookie.Cookie;
*/
public class Http4FileSystemConfigBuilder extends FileSystemConfigBuilder {
+ /**
+ * Defines whether the HttpClient should follow redirections from the responses.
+ * <p>
+ * This parameter expects a value of type {@link Boolean}.
+ * </p>
+ */
+ protected static final String KEY_FOLLOW_REDIRECT = "followRedirect";
+
private static final Http4FileSystemConfigBuilder BUILDER = new Http4FileSystemConfigBuilder();
/**
@@ -105,14 +113,6 @@ public class Http4FileSystemConfigBuilder extends FileSystemConfigBuilder {
private static final String HOSTNAME_VERIFICATION_ENABLED = "http.hostname-verification.enabled";
/**
- * Defines whether the HttpClient should follow redirections from the responses.
- * <p>
- * This parameter expects a value of type {@link Boolean}.
- * </p>
- */
- protected static final String KEY_FOLLOW_REDIRECT = "followRedirect";
-
- /**
* Defines the User-Agent request header string of the underlying HttpClient.
* <p>
* This parameter expects a value of type {@link String}.
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileSystemConfigBuilder.java
index e8eeaee..014e95d 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileSystemConfigBuilder.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileSystemConfigBuilder.java
@@ -33,6 +33,14 @@ import org.apache.hc.core5.http.HttpHost;
*/
public class Http5FileSystemConfigBuilder extends FileSystemConfigBuilder {
+ /**
+ * Defines whether the HttpClient should follow redirections from the responses.
+ * <p>
+ * This parameter expects a value of type {@link Boolean}.
+ * </p>
+ */
+ protected static final String KEY_FOLLOW_REDIRECT = "followRedirect";
+
private static final Http5FileSystemConfigBuilder BUILDER = new Http5FileSystemConfigBuilder();
/**
@@ -105,14 +113,6 @@ public class Http5FileSystemConfigBuilder extends FileSystemConfigBuilder {
private static final String HOSTNAME_VERIFICATION_ENABLED = "http.hostname-verification.enabled";
/**
- * Defines whether the HttpClient should follow redirections from the responses.
- * <p>
- * This parameter expects a value of type {@link Boolean}.
- * </p>
- */
- protected static final String KEY_FOLLOW_REDIRECT = "followRedirect";
-
- /**
* Defines the charset of a URL.
*/
private static final String KEY_URL_CHARSET = "urlCharset";
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java
index edb353d..dd9bb68 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContent.java
@@ -32,8 +32,8 @@ import org.apache.commons.vfs2.util.RandomAccessMode;
*/
final class LocalFileRandomAccessContent extends AbstractRandomAccessContent {
- private final static int BYTE_VALUE_MASK = 0xFF;
- // private final LocalFile localFile;
+ private static final int BYTE_VALUE_MASK = 0xFF;
+
private final RandomAccessFile raf;
private final InputStream rafis;
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 d6d571a..c1b7d68 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
@@ -33,7 +33,7 @@ import org.apache.commons.vfs2.util.RandomAccessMode;
*/
public class RamFileRandomAccessContent implements RandomAccessContent {
- private final static int BYTE_VALUE_MASK = 0xFF;
+ private static final int BYTE_VALUE_MASK = 0xFF;
/**
* File Pointer
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
index 5972182..e335202 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
@@ -75,6 +75,28 @@ public final class SftpFileSystemConfigBuilder extends FileSystemConfigBuilder {
return this.proxyType.hashCode();
}
}
+
+ /** HTTP Proxy. */
+ public static final ProxyType PROXY_HTTP = new ProxyType("http");
+
+ /** SOCKS Proxy. */
+ public static final ProxyType PROXY_SOCKS5 = new ProxyType("socks");
+
+ /**
+ * Connects to the SFTP server through a remote host reached by SSH.
+ * <p>
+ * On this proxy host, a command (e.g. {@linkplain SftpStreamProxy#NETCAT_COMMAND} or
+ * {@linkplain SftpStreamProxy#NETCAT_COMMAND}) is run to forward input/output streams between the target host and
+ * the VFS host.
+ * </p>
+ * <p>
+ * When used, the proxy username ({@linkplain #setProxyUser}) and hostname ({@linkplain #setProxyHost}) <b>must</b>
+ * be set. Optionnaly, the command ({@linkplain #setProxyCommand}), password ({@linkplain #setProxyPassword}) and
+ * connection options ({@linkplain #setProxyOptions}) can be set.
+ * </p>
+ */
+ public static final ProxyType PROXY_STREAM = new ProxyType("stream");
+
private static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ZERO;
private static final Duration DEFAULT_SESSION_TIMEOUT = Duration.ZERO;
@@ -101,27 +123,6 @@ public final class SftpFileSystemConfigBuilder extends FileSystemConfigBuilder {
private static final String PROXY_PORT = PREFIX + ".PROXY_PORT";
private static final String DISABLE_DETECT_EXEC_CHANNEL = PREFIX + ".DISABLE_DETECT_EXEC_CHANNEL";
- /** HTTP Proxy. */
- public static final ProxyType PROXY_HTTP = new ProxyType("http");
-
- /** SOCKS Proxy. */
- public static final ProxyType PROXY_SOCKS5 = new ProxyType("socks");
-
- /**
- * Connects to the SFTP server through a remote host reached by SSH.
- * <p>
- * On this proxy host, a command (e.g. {@linkplain SftpStreamProxy#NETCAT_COMMAND} or
- * {@linkplain SftpStreamProxy#NETCAT_COMMAND}) is run to forward input/output streams between the target host and
- * the VFS host.
- * </p>
- * <p>
- * When used, the proxy username ({@linkplain #setProxyUser}) and hostname ({@linkplain #setProxyHost}) <b>must</b>
- * be set. Optionnaly, the command ({@linkplain #setProxyCommand}), password ({@linkplain #setProxyPassword}) and
- * connection options ({@linkplain #setProxyOptions}) can be set.
- * </p>
- */
- public static final ProxyType PROXY_STREAM = new ProxyType("stream");
-
private static final String PROXY_TYPE = PREFIX + ".PROXY_TYPE";
private static final String PROXY_USER = PREFIX + ".PROXY_USER";
private static final String SESSION_TIMEOUT = PREFIX + ".TIMEOUT";
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java
index 0aabd58..b926b7e 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java
@@ -39,7 +39,7 @@ final class URIBitSets {
* escape indicator, it must be escaped as "%25" in order to be used as
* data within a URI.
*/
- protected static final BitSet PERCENT = createBitSet();
+ static final BitSet PERCENT = createBitSet();
// Static initializer for percent
static {
PERCENT.set('%');
@@ -52,7 +52,7 @@ final class URIBitSets {
* "8" | "9"
* </pre></blockquote></p>
*/
- protected static final BitSet DIGIT = createBitSet();
+ static final BitSet DIGIT = createBitSet();
// Static initializer for digit
static {
for (int i = '0'; i <= '9'; i++) {
@@ -66,7 +66,7 @@ final class URIBitSets {
* alpha = lowalpha | upalpha
* </pre></blockquote></p>
*/
- protected static final BitSet ALPHA = createBitSet();
+ static final BitSet ALPHA = createBitSet();
// Static initializer for alpha
static {
for (int i = 'a'; i <= 'z'; i++) {
@@ -83,7 +83,7 @@ final class URIBitSets {
* alphanum = alpha | digit
* </pre></blockquote></p>
*/
- protected static final BitSet ALPHANUM = createBitSet();
+ static final BitSet ALPHANUM = createBitSet();
// Static initializer for alphanum
static {
ALPHANUM.or(ALPHA);
@@ -97,7 +97,7 @@ final class URIBitSets {
* "a" | "b" | "c" | "d" | "e" | "f"
* </pre></blockquote></p>
*/
- protected static final BitSet HEX = createBitSet();
+ static final BitSet HEX = createBitSet();
// Static initializer for hex
static {
HEX.or(DIGIT);
@@ -115,7 +115,7 @@ final class URIBitSets {
* escaped = "%" hex hex
* </pre></blockquote></p>
*/
- protected static final BitSet ESCAPED = createBitSet();
+ static final BitSet ESCAPED = createBitSet();
// Static initializer for escaped
static {
ESCAPED.or(PERCENT);
@@ -129,7 +129,7 @@ final class URIBitSets {
* "(" | ")"
* </pre></blockquote></p>
*/
- protected static final BitSet MARK = createBitSet();
+ static final BitSet MARK = createBitSet();
// Static initializer for mark
static {
MARK.set('-');
@@ -150,7 +150,7 @@ final class URIBitSets {
* unreserved = alphanum | mark
* </pre></blockquote></p>
*/
- protected static final BitSet UNRESERVED = createBitSet();
+ static final BitSet UNRESERVED = createBitSet();
// Static initializer for unreserved
static {
UNRESERVED.or(ALPHANUM);
@@ -164,7 +164,7 @@ final class URIBitSets {
* "$" | ","
* </pre></blockquote></p>
*/
- protected static final BitSet RESERVED = createBitSet();
+ static final BitSet RESERVED = createBitSet();
// Static initializer for reserved
static {
RESERVED.set(';');
@@ -185,7 +185,7 @@ final class URIBitSets {
* uric = reserved | unreserved | escaped
* </pre></blockquote></p>
*/
- protected static final BitSet URIC = createBitSet();
+ static final BitSet URIC = createBitSet();
// Static initializer for uric
static {
URIC.or(RESERVED);
@@ -199,7 +199,7 @@ final class URIBitSets {
* fragment = *uric
* </pre></blockquote></p>
*/
- protected static final BitSet FRAGMENT = URIC;
+ static final BitSet FRAGMENT = URIC;
/**
* BitSet for query (alias for uric).
@@ -207,7 +207,7 @@ final class URIBitSets {
* query = *uric
* </pre></blockquote></p>
*/
- protected static final BitSet QUERY = URIC;
+ static final BitSet QUERY = URIC;
/**
* BitSet for pchar.
@@ -216,7 +216,7 @@ final class URIBitSets {
* ":" | "@" | "&" | "=" | "+" | "$" | ","
* </pre></blockquote></p>
*/
- protected static final BitSet PCHAR = createBitSet();
+ static final BitSet PCHAR = createBitSet();
// Static initializer for pchar
static {
PCHAR.or(UNRESERVED);
@@ -236,7 +236,7 @@ final class URIBitSets {
* param = *pchar
* </pre></blockquote></p>
*/
- protected static final BitSet PARAM = PCHAR;
+ static final BitSet PARAM = PCHAR;
/**
* BitSet for segment.
@@ -244,7 +244,7 @@ final class URIBitSets {
* segment = *pchar *( ";" param )
* </pre></blockquote></p>
*/
- protected static final BitSet SEGMENT = createBitSet();
+ static final BitSet SEGMENT = createBitSet();
// Static initializer for segment
static {
SEGMENT.or(PCHAR);
@@ -258,7 +258,7 @@ final class URIBitSets {
* path_segments = segment *( "/" segment )
* </pre></blockquote></p>
*/
- protected static final BitSet PATH_SEGMENTS = createBitSet();
+ static final BitSet PATH_SEGMENTS = createBitSet();
// Static initializer for path_segments
static {
PATH_SEGMENTS.set('/');
@@ -271,7 +271,7 @@ final class URIBitSets {
* abs_path = "/" path_segments
* </pre></blockquote></p>
*/
- protected static final BitSet ABS_PATH = createBitSet();
+ static final BitSet ABS_PATH = createBitSet();
// Static initializer for abs_path
static {
ABS_PATH.set('/');
@@ -285,7 +285,7 @@ final class URIBitSets {
* "&" | "=" | "+" | "$" | ","
* </pre></blockquote></p>
*/
- protected static final BitSet URIC_NO_SLASH = createBitSet();
+ static final BitSet URIC_NO_SLASH = createBitSet();
// Static initializer for uric_no_slash
static {
URIC_NO_SLASH.or(UNRESERVED);
@@ -307,7 +307,7 @@ final class URIBitSets {
* opaque_part = uric_no_slash *uric
* </pre></blockquote></p>
*/
- protected static final BitSet OPAQUE_PART = createBitSet();
+ static final BitSet OPAQUE_PART = createBitSet();
// Static initializer for opaque_part
static {
// it's generous. because first character must not include a slash
@@ -321,7 +321,7 @@ final class URIBitSets {
* path = [ abs_path | opaque_part ]
* </pre></blockquote></p>
*/
- protected static final BitSet PATH = createBitSet();
+ static final BitSet PATH = createBitSet();
// Static initializer for path
static {
@@ -332,7 +332,7 @@ final class URIBitSets {
/**
* Port, a logical alias for digit.
*/
- protected static final BitSet PORT = DIGIT;
+ static final BitSet PORT = DIGIT;
/**
* Bitset that combines digit and dot fo IPv$address.
@@ -340,7 +340,7 @@ final class URIBitSets {
* IPv4address = 1*digit "." 1*digit "." 1*digit "." 1*digit
* </pre></blockquote></p>
*/
- protected static final BitSet IPV4ADDRESS = createBitSet();
+ static final BitSet IPV4ADDRESS = createBitSet();
// Static initializer for IPv4address
static {
IPV4ADDRESS.or(DIGIT);
@@ -353,7 +353,7 @@ final class URIBitSets {
* IPv6address = hexpart [ ":" IPv4address ]
* </pre></blockquote></p>
*/
- protected static final BitSet IPV6ADDRESS = createBitSet();
+ static final BitSet IPV6ADDRESS = createBitSet();
// Static initializer for IPv6address reference
static {
IPV6ADDRESS.or(HEX); // hexpart
@@ -367,7 +367,7 @@ final class URIBitSets {
* IPv6reference = "[" IPv6address "]"
* </pre></blockquote></p>
*/
- protected static final BitSet IPV6REFERENCE = createBitSet();
+ static final BitSet IPV6REFERENCE = createBitSet();
// Static initializer for IPv6reference
static {
IPV6REFERENCE.set('[');
@@ -381,7 +381,7 @@ final class URIBitSets {
* toplabel = alpha | alpha *( alphanum | "-" ) alphanum
* </pre></blockquote></p>
*/
- protected static final BitSet TOPLABEL = createBitSet();
+ static final BitSet TOPLABEL = createBitSet();
// Static initializer for toplabel
static {
TOPLABEL.or(ALPHANUM);
@@ -394,7 +394,7 @@ final class URIBitSets {
* domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
* </pre></blockquote></p>
*/
- protected static final BitSet DOMAINLABEL = TOPLABEL;
+ static final BitSet DOMAINLABEL = TOPLABEL;
/**
* BitSet for hostname.
@@ -402,7 +402,7 @@ final class URIBitSets {
* hostname = *( domainlabel "." ) toplabel [ "." ]
* </pre></blockquote></p>
*/
- protected static final BitSet HOSTNAME = createBitSet();
+ static final BitSet HOSTNAME = createBitSet();
// Static initializer for hostname
static {
HOSTNAME.or(TOPLABEL);
@@ -416,7 +416,7 @@ final class URIBitSets {
* host = hostname | IPv4address | IPv6reference
* </pre></blockquote></p>
*/
- protected static final BitSet HOST = createBitSet();
+ static final BitSet HOST = createBitSet();
// Static initializer for host
static {
HOST.or(HOSTNAME);
@@ -430,7 +430,7 @@ final class URIBitSets {
* hostport = host [ ":" port ]
* </pre></blockquote></p>
*/
- protected static final BitSet HOSTPORT = createBitSet();
+ static final BitSet HOSTPORT = createBitSet();
// Static initializer for hostport
static {
HOSTPORT.or(HOST);
@@ -445,7 +445,7 @@ final class URIBitSets {
* ";" | ":" | "&" | "=" | "+" | "$" | "," )
* </pre></blockquote></p>
*/
- protected static final BitSet USERINFO = createBitSet();
+ static final BitSet USERINFO = createBitSet();
// Static initializer for userinfo
static {
USERINFO.or(UNRESERVED);
@@ -462,7 +462,7 @@ final class URIBitSets {
/**
* BitSet for within the userinfo component like user and password.
*/
- public static final BitSet WITHIN_USERRINFO = createBitSet();
+ static final BitSet WITHIN_USERRINFO = createBitSet();
// Static initializer for within_userinfo
static {
WITHIN_USERRINFO.or(USERINFO);
@@ -479,7 +479,7 @@ final class URIBitSets {
* server = [ [ userinfo "@" ] hostport ]
* </pre></blockquote></p>
*/
- protected static final BitSet SERVER = createBitSet();
+ static final BitSet SERVER = createBitSet();
// Static initializer for server
static {
SERVER.or(USERINFO);
@@ -494,7 +494,7 @@ final class URIBitSets {
* ";" | ":" | "@" | "&" | "=" | "+" )
* </pre></blockquote></p>
*/
- protected static final BitSet REG_NAME = createBitSet();
+ static final BitSet REG_NAME = createBitSet();
// Static initializer for reg_name
static {
REG_NAME.or(UNRESERVED);
@@ -515,7 +515,7 @@ final class URIBitSets {
* authority = server | reg_name
* </pre></blockquote></p>
*/
- protected static final BitSet AUTHORITY = createBitSet();
+ static final BitSet AUTHORITY = createBitSet();
// Static initializer for authority
static {
AUTHORITY.or(SERVER);
@@ -528,7 +528,7 @@ final class URIBitSets {
* scheme = alpha *( alpha | digit | "+" | "-" | "." )
* </pre></blockquote></p>
*/
- protected static final BitSet SCHEME = createBitSet();
+ static final BitSet SCHEME = createBitSet();
// Static initializer for scheme
static {
SCHEME.or(ALPHA);
@@ -545,7 +545,7 @@ final class URIBitSets {
* ";" | "@" | "&" | "=" | "+" | "$" | "," )
* </pre></blockquote></p>
*/
- protected static final BitSet REL_SEGMENT = createBitSet();
+ static final BitSet REL_SEGMENT = createBitSet();
// Static initializer for rel_segment
static {
REL_SEGMENT.or(UNRESERVED);
@@ -565,7 +565,7 @@ final class URIBitSets {
* rel_path = rel_segment [ abs_path ]
* </pre></blockquote></p>
*/
- protected static final BitSet REL_PATH = createBitSet();
+ static final BitSet REL_PATH = createBitSet();
// Static initializer for rel_path
static {
REL_PATH.or(REL_SEGMENT);
@@ -578,7 +578,7 @@ final class URIBitSets {
* net_path = "//" authority [ abs_path ]
* </pre></blockquote></p>
*/
- protected static final BitSet NET_PATH = createBitSet();
+ static final BitSet NET_PATH = createBitSet();
// Static initializer for net_path
static {
NET_PATH.set('/');
@@ -592,7 +592,7 @@ final class URIBitSets {
* hier_part = ( net_path | abs_path ) [ "?" query ]
* </pre></blockquote></p>
*/
- protected static final BitSet HIER_PART = createBitSet();
+ static final BitSet HIER_PART = createBitSet();
// Static initializer for hier_part
static {
HIER_PART.or(NET_PATH);
@@ -607,7 +607,7 @@ final class URIBitSets {
* relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ]
* </pre></blockquote></p>
*/
- protected static final BitSet RELATIVEURI = createBitSet();
+ static final BitSet RELATIVEURI = createBitSet();
// Static initializer for relativeURI
static {
RELATIVEURI.or(NET_PATH);
@@ -623,7 +623,7 @@ final class URIBitSets {
* absoluteURI = scheme ":" ( hier_part | opaque_part )
* </pre></blockquote></p>
*/
- protected static final BitSet ABSOLUTEURI = createBitSet();
+ static final BitSet ABSOLUTEURI = createBitSet();
// Static initializer for absoluteURI
static {
ABSOLUTEURI.or(SCHEME);
@@ -638,7 +638,7 @@ final class URIBitSets {
* URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
* </pre></blockquote></p>
*/
- protected static final BitSet URI_REFERENCE = createBitSet();
+ static final BitSet URI_REFERENCE = createBitSet();
// Static initializer for URI_reference
static {
URI_REFERENCE.or(ABSOLUTEURI);
@@ -653,7 +653,7 @@ final class URIBitSets {
/**
* BitSet for control.
*/
- public static final BitSet CONTROL = createBitSet();
+ static final BitSet CONTROL = createBitSet();
// Static initializer for control
static {
for (int i = 0; i <= 0x1F; i++) {
@@ -665,7 +665,7 @@ final class URIBitSets {
/**
* BitSet for space.
*/
- public static final BitSet SPACE = createBitSet();
+ static final BitSet SPACE = createBitSet();
// Static initializer for space
static {
SPACE.set(0x20);
@@ -674,7 +674,7 @@ final class URIBitSets {
/**
* BitSet for delims.
*/
- public static final BitSet DELIMS = createBitSet();
+ static final BitSet DELIMS = createBitSet();
// Static initializer for delims
static {
DELIMS.set('<');
@@ -687,7 +687,7 @@ final class URIBitSets {
/**
* BitSet for unwise.
*/
- public static final BitSet UNWISE = createBitSet();
+ static final BitSet UNWISE = createBitSet();
// Static initializer for unwise
static {
UNWISE.set('{');
@@ -703,7 +703,7 @@ final class URIBitSets {
/**
* Disallowed rel_path before escaping.
*/
- public static final BitSet DISALLOWED_REL_PATH = createBitSet();
+ static final BitSet DISALLOWED_REL_PATH = createBitSet();
// Static initializer for disallowed_rel_path
static {
DISALLOWED_REL_PATH.or(URIC);
@@ -713,7 +713,7 @@ final class URIBitSets {
/**
* Disallowed opaque_part before escaping.
*/
- public static final BitSet DISALLOWED_OPAQUE_PART = createBitSet();
+ static final BitSet DISALLOWED_OPAQUE_PART = createBitSet();
// Static initializer for disallowed_opaque_part
static {
DISALLOWED_OPAQUE_PART.or(URIC);
@@ -725,7 +725,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the authority component.
*/
- public static final BitSet ALLOWED_AUTHORITY = createBitSet();
+ static final BitSet ALLOWED_AUTHORITY = createBitSet();
// Static initializer for allowed_authority
static {
ALLOWED_AUTHORITY.or(AUTHORITY);
@@ -735,7 +735,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the opaque_part.
*/
- public static final BitSet ALLOWED_OPAQUE_PART = createBitSet();
+ static final BitSet ALLOWED_OPAQUE_PART = createBitSet();
// Static initializer for allowed_opaque_part
static {
ALLOWED_OPAQUE_PART.or(OPAQUE_PART);
@@ -745,7 +745,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the reg_name.
*/
- public static final BitSet ALLOWED_REG_NAME = createBitSet();
+ static final BitSet ALLOWED_REG_NAME = createBitSet();
// Static initializer for allowed_reg_name
static {
ALLOWED_REG_NAME.or(REG_NAME);
@@ -756,7 +756,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the userinfo component.
*/
- public static final BitSet ALLOWED_USER_INFO = createBitSet();
+ static final BitSet ALLOWED_USER_INFO = createBitSet();
// Static initializer for allowed_userinfo
static {
ALLOWED_USER_INFO.or(USERINFO);
@@ -767,7 +767,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for within the userinfo component.
*/
- public static final BitSet ALLOWED_WITHIN_USERINFO = createBitSet();
+ static final BitSet ALLOWED_WITHIN_USERINFO = createBitSet();
// Static initializer for allowed_within_userinfo
static {
ALLOWED_WITHIN_USERINFO.or(WITHIN_USERRINFO);
@@ -778,7 +778,7 @@ final class URIBitSets {
* Those characters that are allowed for the IPv6reference component.
* The characters '[', ']' in IPv6reference should be excluded.
*/
- public static final BitSet ALLOWED_IPV6REFERENCE = createBitSet();
+ static final BitSet ALLOWED_IPV6REFERENCE = createBitSet();
// Static initializer for allowed_IPv6reference
static {
ALLOWED_IPV6REFERENCE.or(IPV6REFERENCE);
@@ -791,7 +791,7 @@ final class URIBitSets {
* Those characters that are allowed for the host component.
* The characters '[', ']' in IPv6reference should be excluded.
*/
- public static final BitSet ALLOWED_HOST = createBitSet();
+ static final BitSet ALLOWED_HOST = createBitSet();
// Static initializer for allowed_host
static {
ALLOWED_HOST.or(HOSTNAME);
@@ -801,7 +801,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the authority component.
*/
- public static final BitSet ALLOWED_WITHIN_AUTHORITY = createBitSet();
+ static final BitSet ALLOWED_WITHIN_AUTHORITY = createBitSet();
// Static initializer for allowed_within_authority
static {
ALLOWED_WITHIN_AUTHORITY.or(SERVER);
@@ -816,7 +816,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the abs_path.
*/
- public static final BitSet ALLOWED_ABS_PATH = createBitSet();
+ static final BitSet ALLOWED_ABS_PATH = createBitSet();
// Static initializer for allowed_abs_path
static {
ALLOWED_ABS_PATH.or(ABS_PATH);
@@ -828,7 +828,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the rel_path.
*/
- public static final BitSet ALLOWED_REL_PATH = createBitSet();
+ static final BitSet ALLOWED_REL_PATH = createBitSet();
// Static initializer for allowed_rel_path
static {
ALLOWED_REL_PATH.or(REL_PATH);
@@ -839,7 +839,7 @@ final class URIBitSets {
/**
* Those characters that are allowed within the path.
*/
- public static final BitSet ALLOWED_WITHIN_PATH = createBitSet();
+ static final BitSet ALLOWED_WITHIN_PATH = createBitSet();
// Static initializer for allowed_within_path
static {
ALLOWED_WITHIN_PATH.or(ABS_PATH);
@@ -852,7 +852,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the query component.
*/
- public static final BitSet ALLOWED_QUERY = createBitSet();
+ static final BitSet ALLOWED_QUERY = createBitSet();
// Static initializer for allowed_query
static {
ALLOWED_QUERY.or(URIC);
@@ -862,7 +862,7 @@ final class URIBitSets {
/**
* Those characters that are allowed within the query component.
*/
- public static final BitSet ALLOWED_WITHIN_QUERY = createBitSet();
+ static final BitSet ALLOWED_WITHIN_QUERY = createBitSet();
// Static initializer for allowed_within_query
static {
ALLOWED_WITHIN_QUERY.or(ALLOWED_QUERY);
@@ -872,7 +872,7 @@ final class URIBitSets {
/**
* Those characters that are allowed for the fragment component.
*/
- public static final BitSet ALLOWED_FRAGMENT = createBitSet();
+ static final BitSet ALLOWED_FRAGMENT = createBitSet();
// Static initializer for allowed_fragment
static {
ALLOWED_FRAGMENT.or(URIC);