diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java index a5d4a467ce..4f4ac1ceaa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.http.client; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.ContentSummary; import org.apache.hadoop.fs.DelegationTokenRenewer; @@ -68,6 +69,7 @@ *

* This implementation allows a user to access HDFS over HTTP via a HttpFSServer server. */ +@InterfaceAudience.Private public class HttpFSFileSystem extends FileSystem implements DelegationTokenRenewer.Renewable { @@ -160,7 +162,8 @@ public static FILE_TYPE getType(FileStatus fileStatus) { private static final String HTTP_POST = "POST"; private static final String HTTP_DELETE = "DELETE"; - public enum Operation { + @InterfaceAudience.Private + public static enum Operation { OPEN(HTTP_GET), GETFILESTATUS(HTTP_GET), LISTSTATUS(HTTP_GET), GETHOMEDIRECTORY(HTTP_GET), GETCONTENTSUMMARY(HTTP_GET), GETFILECHECKSUM(HTTP_GET), GETFILEBLOCKLOCATIONS(HTTP_GET), diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSKerberosAuthenticator.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSKerberosAuthenticator.java index f73ed7e3b0..8a766f2318 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSKerberosAuthenticator.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSKerberosAuthenticator.java @@ -18,6 +18,7 @@ package org.apache.hadoop.fs.http.client; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.authentication.client.AuthenticatedURL; @@ -43,6 +44,7 @@ * A KerberosAuthenticator subclass that fallback to * {@link HttpFSPseudoAuthenticator}. */ +@InterfaceAudience.Private public class HttpFSKerberosAuthenticator extends KerberosAuthenticator { /** @@ -71,6 +73,7 @@ protected Authenticator getFallBackAuthenticator() { /** * DelegationToken operations. */ + @InterfaceAudience.Private public static enum DelegationTokenOperation { GETDELEGATIONTOKEN(HTTP_GET, true), GETDELEGATIONTOKENS(HTTP_GET, true), diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSPseudoAuthenticator.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSPseudoAuthenticator.java index 927b1aa188..180149c8e2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSPseudoAuthenticator.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSPseudoAuthenticator.java @@ -18,6 +18,7 @@ package org.apache.hadoop.fs.http.client; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authentication.client.PseudoAuthenticator; @@ -27,6 +28,7 @@ * A PseudoAuthenticator subclass that uses FileSystemAccess's * UserGroupInformation to obtain the client user name (the UGI's login user). */ +@InterfaceAudience.Private public class HttpFSPseudoAuthenticator extends PseudoAuthenticator { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java index 5a8f8c78fe..69e2be4c29 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.http.client; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.Path; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; @@ -35,6 +36,7 @@ /** * Utility methods used by HttpFS classes. */ +@InterfaceAudience.Private public class HttpFSUtils { public static final String SERVICE_NAME = "/webhdfs"; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java index abd382d871..67df9a8e64 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java @@ -19,6 +19,7 @@ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.http.client.HttpFSFileSystem; import javax.servlet.Filter; @@ -37,6 +38,7 @@ * Filter that Enforces the content-type to be application/octet-stream for * POST and PUT requests. */ +@InterfaceAudience.Private public class CheckUploadContentTypeFilter implements Filter { private static final Set UPLOAD_OPERATIONS = new HashSet(); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java index b6ab69f237..f81e90e064 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.ContentSummary; import org.apache.hadoop.fs.FileChecksum; import org.apache.hadoop.fs.FileStatus; @@ -40,6 +41,7 @@ /** * FileSystem operation executors used by {@link HttpFSServer}. */ +@InterfaceAudience.Private public class FSOperations { @SuppressWarnings({"unchecked", "deprecation"}) @@ -160,6 +162,7 @@ private static JSONObject toJSON(String name, Object value) { /** * Executor that performs an append FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSAppend implements FileSystemAccess.FileSystemExecutor { private InputStream is; private Path path; @@ -198,6 +201,7 @@ public Void execute(FileSystem fs) throws IOException { /** * Executor that performs a content-summary FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSContentSummary implements FileSystemAccess.FileSystemExecutor { private Path path; @@ -230,6 +234,7 @@ public Map execute(FileSystem fs) throws IOException { /** * Executor that performs a create FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSCreate implements FileSystemAccess.FileSystemExecutor { private InputStream is; private Path path; @@ -288,6 +293,7 @@ public Void execute(FileSystem fs) throws IOException { /** * Executor that performs a delete FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSDelete implements FileSystemAccess.FileSystemExecutor { private Path path; private boolean recursive; @@ -324,6 +330,7 @@ public JSONObject execute(FileSystem fs) throws IOException { /** * Executor that performs a file-checksum FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSFileChecksum implements FileSystemAccess.FileSystemExecutor { private Path path; @@ -356,6 +363,7 @@ public Map execute(FileSystem fs) throws IOException { /** * Executor that performs a file-status FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSFileStatus implements FileSystemAccess.FileSystemExecutor { private Path path; @@ -388,6 +396,7 @@ public Map execute(FileSystem fs) throws IOException { /** * Executor that performs a home-dir FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSHomeDir implements FileSystemAccess.FileSystemExecutor { /** @@ -413,6 +422,7 @@ public JSONObject execute(FileSystem fs) throws IOException { /** * Executor that performs a list-status FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSListStatus implements FileSystemAccess.FileSystemExecutor, PathFilter { private Path path; private PathFilter filter; @@ -456,6 +466,7 @@ public boolean accept(Path path) { /** * Executor that performs a mkdirs FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSMkdirs implements FileSystemAccess.FileSystemExecutor { private Path path; @@ -494,6 +505,7 @@ public JSONObject execute(FileSystem fs) throws IOException { /** * Executor that performs a open FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSOpen implements FileSystemAccess.FileSystemExecutor { private Path path; @@ -526,6 +538,7 @@ public InputStream execute(FileSystem fs) throws IOException { /** * Executor that performs a rename FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSRename implements FileSystemAccess.FileSystemExecutor { private Path path; private Path toPath; @@ -562,6 +575,7 @@ public JSONObject execute(FileSystem fs) throws IOException { /** * Executor that performs a set-owner FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSSetOwner implements FileSystemAccess.FileSystemExecutor { private Path path; private String owner; @@ -600,6 +614,7 @@ public Void execute(FileSystem fs) throws IOException { /** * Executor that performs a set-permission FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSSetPermission implements FileSystemAccess.FileSystemExecutor { private Path path; @@ -637,6 +652,7 @@ public Void execute(FileSystem fs) throws IOException { /** * Executor that performs a set-replication FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSSetReplication implements FileSystemAccess.FileSystemExecutor { private Path path; private short replication; @@ -676,6 +692,7 @@ public JSONObject execute(FileSystem fs) throws IOException { /** * Executor that performs a set-times FileSystemAccess files system operation. */ + @InterfaceAudience.Private public static class FSSetTimes implements FileSystemAccess.FileSystemExecutor { private Path path; private long mTime; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java index 4bcfa8447b..545654c2f7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.authentication.server.AuthenticationFilter; import javax.servlet.FilterConfig; @@ -30,6 +31,7 @@ * Subclass of hadoop-auth AuthenticationFilter that obtains its configuration * from HttpFSServer's server configuration. */ +@InterfaceAudience.Private public class HttpFSAuthenticationFilter extends AuthenticationFilter { private static final String CONF_PREFIX = "httpfs.authentication."; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java index 60abe96384..3a8d9ada4e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java @@ -19,6 +19,7 @@ package org.apache.hadoop.fs.http.server; import com.sun.jersey.api.container.ContainerException; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.service.FileSystemAccessException; import org.apache.hadoop.lib.wsrs.ExceptionProvider; import org.slf4j.Logger; @@ -35,6 +36,7 @@ * exceptions to HTTP status codes. */ @Provider +@InterfaceAudience.Private public class HttpFSExceptionProvider extends ExceptionProvider { private static Logger AUDIT_LOG = LoggerFactory.getLogger("httpfsaudit"); private static Logger LOG = LoggerFactory.getLogger(HttpFSExceptionProvider.class); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSKerberosAuthenticationHandler.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSKerberosAuthenticationHandler.java index f8602083e1..6481efdb1c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSKerberosAuthenticationHandler.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSKerberosAuthenticationHandler.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.http.client.HttpFSFileSystem; import org.apache.hadoop.fs.http.client.HttpFSKerberosAuthenticator; import org.apache.hadoop.fs.http.client.HttpFSKerberosAuthenticator.DelegationTokenOperation; @@ -52,6 +53,7 @@ * If not delegation token is present in the request it delegates to the * {@link KerberosAuthenticationHandler} */ +@InterfaceAudience.Private public class HttpFSKerberosAuthenticationHandler extends KerberosAuthenticationHandler { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java index e696f33124..7d53411477 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.http.client.HttpFSFileSystem; import org.apache.hadoop.fs.http.client.HttpFSFileSystem.Operation; import org.apache.hadoop.lib.wsrs.BooleanParam; @@ -38,6 +39,7 @@ * HttpFS ParametersProvider. */ @Provider +@InterfaceAudience.Private public class HttpFSParametersProvider extends ParametersProvider { private static final Map>[]> PARAMS_DEF = @@ -85,6 +87,7 @@ public HttpFSParametersProvider() { /** * Class for access-time parameter. */ + @InterfaceAudience.Private public static class AccessTimeParam extends LongParam { /** @@ -102,6 +105,7 @@ public AccessTimeParam() { /** * Class for block-size parameter. */ + @InterfaceAudience.Private public static class BlockSizeParam extends LongParam { /** @@ -120,6 +124,7 @@ public BlockSizeParam() { /** * Class for data parameter. */ + @InterfaceAudience.Private public static class DataParam extends BooleanParam { /** @@ -138,6 +143,7 @@ public DataParam() { /** * Class for operation parameter. */ + @InterfaceAudience.Private public static class OperationParam extends EnumParam { /** @@ -156,6 +162,7 @@ public OperationParam(String operation) { /** * Class for delete's recursive parameter. */ + @InterfaceAudience.Private public static class RecursiveParam extends BooleanParam { /** @@ -174,6 +181,7 @@ public RecursiveParam() { /** * Class for do-as parameter. */ + @InterfaceAudience.Private public static class DoAsParam extends StringParam { /** @@ -208,6 +216,7 @@ public String parseParam(String str) { /** * Class for filter parameter. */ + @InterfaceAudience.Private public static class FilterParam extends StringParam { /** @@ -227,6 +236,7 @@ public FilterParam() { /** * Class for group parameter. */ + @InterfaceAudience.Private public static class GroupParam extends StringParam { /** @@ -246,6 +256,7 @@ public GroupParam() { /** * Class for len parameter. */ + @InterfaceAudience.Private public static class LenParam extends LongParam { /** @@ -264,6 +275,7 @@ public LenParam() { /** * Class for modified-time parameter. */ + @InterfaceAudience.Private public static class ModifiedTimeParam extends LongParam { /** @@ -282,6 +294,7 @@ public ModifiedTimeParam() { /** * Class for offset parameter. */ + @InterfaceAudience.Private public static class OffsetParam extends LongParam { /** @@ -300,6 +313,7 @@ public OffsetParam() { /** * Class for overwrite parameter. */ + @InterfaceAudience.Private public static class OverwriteParam extends BooleanParam { /** @@ -318,6 +332,7 @@ public OverwriteParam() { /** * Class for owner parameter. */ + @InterfaceAudience.Private public static class OwnerParam extends StringParam { /** @@ -337,6 +352,7 @@ public OwnerParam() { /** * Class for permission parameter. */ + @InterfaceAudience.Private public static class PermissionParam extends ShortParam { /** @@ -357,6 +373,7 @@ public PermissionParam() { /** * Class for replication parameter. */ + @InterfaceAudience.Private public static class ReplicationParam extends ShortParam { /** @@ -375,6 +392,7 @@ public ReplicationParam() { /** * Class for to-path parameter. */ + @InterfaceAudience.Private public static class DestinationParam extends StringParam { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.java index 7d2711d2be..0f5b58379d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.java @@ -18,6 +18,7 @@ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.service.FileSystemAccess; import org.apache.hadoop.lib.servlet.FileSystemReleaseFilter; @@ -25,6 +26,7 @@ * Filter that releases FileSystemAccess filesystem instances upon HTTP request * completion. */ +@InterfaceAudience.Private public class HttpFSReleaseFilter extends FileSystemReleaseFilter { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java index 5e974c8e13..0c3418f5c4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java @@ -18,6 +18,7 @@ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.http.client.HttpFSFileSystem; @@ -82,6 +83,7 @@ * different operations. */ @Path(HttpFSFileSystem.SERVICE_VERSION) +@InterfaceAudience.Private public class HttpFSServer { private static Logger AUDIT_LOG = LoggerFactory.getLogger("httpfsaudit"); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java index 8a768e8904..440d7c9702 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java @@ -18,6 +18,7 @@ package org.apache.hadoop.fs.http.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.lib.server.ServerException; @@ -39,6 +40,7 @@ * All the configuration is loaded from configuration properties prefixed * with httpfs.. */ +@InterfaceAudience.Private public class HttpFSServerWebApp extends ServerWebApp { private static final Logger LOG = LoggerFactory.getLogger(HttpFSServerWebApp.class); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/RunnableCallable.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/RunnableCallable.java index c94947eb7f..9e0e09e0d7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/RunnableCallable.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/RunnableCallable.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.lang; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.util.Check; import java.util.concurrent.Callable; @@ -26,6 +27,7 @@ * Adapter class that allows Runnables and Callables to * be treated as the other. */ +@InterfaceAudience.Private public class RunnableCallable implements Callable, Runnable { private Runnable runnable; private Callable callable; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/XException.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/XException.java index 767e3fa4cb..f974159c63 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/XException.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/lang/XException.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.lang; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.util.Check; import java.text.MessageFormat; @@ -26,6 +27,7 @@ * Generic exception that requires error codes and uses the a message * template from the error code. */ +@InterfaceAudience.Private public class XException extends Exception { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/BaseService.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/BaseService.java index f93a30321e..088f90058d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/BaseService.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/BaseService.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.lib.util.ConfigurationUtils; @@ -26,6 +27,7 @@ /** * Convenience class implementing the {@link Service} interface. */ +@InterfaceAudience.Private public abstract class BaseService implements Service { private String prefix; private Server server; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java index 4db1e03a3f..feefcef525 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.lib.util.Check; import org.apache.hadoop.lib.util.ConfigurationUtils; @@ -76,6 +77,7 @@ * post-initialized (this enables late/conditional service bindings). *

*/ +@InterfaceAudience.Private public class Server { private Logger log; @@ -97,7 +99,8 @@ public class Server { /** * Enumeration that defines the server status. */ - public enum Status { + @InterfaceAudience.Private + public static enum Status { UNDEF(false, false), BOOTING(false, true), HALTED(true, true), diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServerException.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServerException.java index 1b1476279f..e3759ce787 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServerException.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServerException.java @@ -18,16 +18,19 @@ package org.apache.hadoop.lib.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.lang.XException; /** * Exception thrown by the {@link Server} class. */ +@InterfaceAudience.Private public class ServerException extends XException { /** * Error codes use by the {@link Server} class. */ + @InterfaceAudience.Private public static enum ERROR implements XException.ERROR { S01("Dir [{0}] does not exist"), S02("[{0}] is not a directory"), diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Service.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Service.java index 9bea5ce6db..71043339fb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Service.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Service.java @@ -18,9 +18,12 @@ package org.apache.hadoop.lib.server; +import org.apache.hadoop.classification.InterfaceAudience; + /** * Service interface for components to be managed by the {@link Server} class. */ +@InterfaceAudience.Private public interface Service { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServiceException.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServiceException.java index de8ac3ee30..44f7114763 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServiceException.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/ServiceException.java @@ -18,11 +18,13 @@ package org.apache.hadoop.lib.server; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.lang.XException; /** * Exception thrown by {@link Service} implementations. */ +@InterfaceAudience.Private public class ServiceException extends ServerException { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenIdentifier.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenIdentifier.java index 8d1703fd36..f245b6c972 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenIdentifier.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenIdentifier.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.http.client.HttpFSKerberosAuthenticator; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier; @@ -24,6 +25,7 @@ /** * HttpFS DelegationTokenIdentifier implementation. */ +@InterfaceAudience.Private public class DelegationTokenIdentifier extends AbstractDelegationTokenIdentifier { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManager.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManager.java index 4c679576b1..a163baf16c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManager.java @@ -17,12 +17,14 @@ */ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; /** * Service interface to manage HttpFS delegation tokens. */ +@InterfaceAudience.Private public interface DelegationTokenManager { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManagerException.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManagerException.java index 0939f217a8..62ec2f920b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManagerException.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/DelegationTokenManagerException.java @@ -17,11 +17,13 @@ */ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.lang.XException; /** * Exception thrown by the {@link DelegationTokenManager} service implementation. */ +@InterfaceAudience.Private public class DelegationTokenManagerException extends XException { public enum ERROR implements XException.ERROR { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccess.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccess.java index 5d8ce9e6e2..da128f5ad8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccess.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccess.java @@ -18,11 +18,13 @@ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import java.io.IOException; +@InterfaceAudience.Private public interface FileSystemAccess { public interface FileSystemExecutor { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccessException.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccessException.java index 42fc8ff1bd..189afe9eeb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccessException.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/FileSystemAccessException.java @@ -18,8 +18,10 @@ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.lang.XException; +@InterfaceAudience.Private public class FileSystemAccessException extends XException { public enum ERROR implements XException.ERROR { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Groups.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Groups.java index e83b05916a..90733f9cdc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Groups.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Groups.java @@ -18,9 +18,12 @@ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; + import java.io.IOException; import java.util.List; +@InterfaceAudience.Private public interface Groups { public List getGroups(String user) throws IOException; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Instrumentation.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Instrumentation.java index df326f758b..42e56e9076 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Instrumentation.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Instrumentation.java @@ -18,8 +18,11 @@ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; + import java.util.Map; +@InterfaceAudience.Private public interface Instrumentation { public interface Cron { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/ProxyUser.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/ProxyUser.java index 60e93a6bfe..7619dcd200 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/ProxyUser.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/ProxyUser.java @@ -18,9 +18,12 @@ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; + import java.io.IOException; import java.security.AccessControlException; +@InterfaceAudience.Private public interface ProxyUser { public void validate(String proxyUser, String proxyHost, String doAsUser) throws IOException, AccessControlException; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Scheduler.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Scheduler.java index 14abc1c687..0f9c630faf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Scheduler.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/Scheduler.java @@ -18,9 +18,12 @@ package org.apache.hadoop.lib.service; +import org.apache.hadoop.classification.InterfaceAudience; + import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +@InterfaceAudience.Private public interface Scheduler { public abstract void schedule(Callable callable, long delay, long interval, TimeUnit unit); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java index 35255d3405..a2e543aefe 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.service.hadoop; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileSystem; @@ -47,6 +48,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +@InterfaceAudience.Private public class FileSystemAccessService extends BaseService implements FileSystemAccess { private static final Logger LOG = LoggerFactory.getLogger(FileSystemAccessService.class); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java index 63c177bdb9..9a36955d6a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.service.instrumentation; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.server.BaseService; import org.apache.hadoop.lib.server.ServiceException; import org.apache.hadoop.lib.service.Instrumentation; @@ -39,6 +40,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +@InterfaceAudience.Private public class InstrumentationService extends BaseService implements Instrumentation { public static final String PREFIX = "instrumentation"; public static final String CONF_TIMERS_SIZE = "timers.size"; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/scheduler/SchedulerService.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/scheduler/SchedulerService.java index 85ec4474ac..f4e5bafece 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/scheduler/SchedulerService.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/scheduler/SchedulerService.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.service.scheduler; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.lang.RunnableCallable; import org.apache.hadoop.lib.server.BaseService; import org.apache.hadoop.lib.server.Server; @@ -35,6 +36,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; +@InterfaceAudience.Private public class SchedulerService extends BaseService implements Scheduler { private static final Logger LOG = LoggerFactory.getLogger(SchedulerService.class); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/DelegationTokenManagerService.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/DelegationTokenManagerService.java index 3acd164948..78905dc2ec 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/DelegationTokenManagerService.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/DelegationTokenManagerService.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.lib.service.security; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.http.server.HttpFSServerWebApp; import org.apache.hadoop.io.Text; import org.apache.hadoop.lib.server.BaseService; @@ -37,6 +38,7 @@ /** * DelegationTokenManager service implementation. */ +@InterfaceAudience.Private public class DelegationTokenManagerService extends BaseService implements DelegationTokenManager { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/GroupsService.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/GroupsService.java index d1e75fc510..560a3ccf6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/GroupsService.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/GroupsService.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.service.security; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.lib.server.BaseService; import org.apache.hadoop.lib.server.ServiceException; @@ -27,6 +28,7 @@ import java.io.IOException; import java.util.List; +@InterfaceAudience.Private public class GroupsService extends BaseService implements Groups { private static final String PREFIX = "groups"; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/ProxyUserService.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/ProxyUserService.java index 3eefd3657c..095ce11b4d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/ProxyUserService.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/security/ProxyUserService.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.service.security; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.lib.lang.XException; import org.apache.hadoop.lib.server.BaseService; import org.apache.hadoop.lib.server.ServiceException; @@ -38,10 +39,12 @@ import java.util.Map; import java.util.Set; +@InterfaceAudience.Private public class ProxyUserService extends BaseService implements ProxyUser { private static Logger LOG = LoggerFactory.getLogger(ProxyUserService.class); - public enum ERROR implements XException.ERROR { + @InterfaceAudience.Private + public static enum ERROR implements XException.ERROR { PRXU01("Could not normalize host name [{0}], {1}"), PRXU02("Missing [{0}] property"); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java index ab61fbbb89..827bcff891 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.servlet; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.lib.service.FileSystemAccess; @@ -37,6 +38,7 @@ * is streaming out HDFS data and the corresponding filesystem * instance have to be closed after the streaming completes. */ +@InterfaceAudience.Private public abstract class FileSystemReleaseFilter implements Filter { private static final ThreadLocal FILE_SYSTEM_TL = new ThreadLocal(); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java index cb9f550291..39b7e4fb61 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java @@ -19,6 +19,8 @@ package org.apache.hadoop.lib.servlet; +import org.apache.hadoop.classification.InterfaceAudience; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -31,6 +33,7 @@ /** * Filter that resolves the requester hostname. */ +@InterfaceAudience.Private public class HostnameFilter implements Filter { static final ThreadLocal HOSTNAME_TL = new ThreadLocal(); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java index b8daf1b179..07b552d7ec 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.servlet; +import org.apache.hadoop.classification.InterfaceAudience; import org.slf4j.MDC; import javax.servlet.Filter; @@ -42,6 +43,7 @@ *

  • path: the path of the request URL
    • * */ +@InterfaceAudience.Private public class MDCFilter implements Filter { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java index 277b17fed2..c56f6e4968 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java @@ -19,6 +19,7 @@ package org.apache.hadoop.lib.servlet; import com.google.common.annotations.VisibleForTesting; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.lib.server.Server; import org.apache.hadoop.lib.server.ServerException; @@ -34,6 +35,7 @@ * {@link Server} subclass that implements ServletContextListener * and uses its lifecycle to start and stop the server. */ +@InterfaceAudience.Private public abstract class ServerWebApp extends Server implements ServletContextListener { private static final String HOME_DIR = ".home.dir"; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/Check.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/Check.java index 26ad35570a..a398e75845 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/Check.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/Check.java @@ -18,6 +18,8 @@ package org.apache.hadoop.lib.util; +import org.apache.hadoop.classification.InterfaceAudience; + import java.text.MessageFormat; import java.util.List; import java.util.regex.Pattern; @@ -27,6 +29,7 @@ *

    * Commonly used for method arguments preconditions. */ +@InterfaceAudience.Private public class Check { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/ConfigurationUtils.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/ConfigurationUtils.java index 820abf4eb4..660eae0835 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/ConfigurationUtils.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/util/ConfigurationUtils.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.util; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.w3c.dom.DOMException; import org.w3c.dom.Document; @@ -37,6 +38,7 @@ /** * Configuration utilities. */ +@InterfaceAudience.Private public abstract class ConfigurationUtils { /** diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/BooleanParam.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/BooleanParam.java index e4e6355063..bce8c3b0d9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/BooleanParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/BooleanParam.java @@ -18,8 +18,11 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; + import java.text.MessageFormat; +@InterfaceAudience.Private public abstract class BooleanParam extends Param { public BooleanParam(String name, Boolean defaultValue) { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ByteParam.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ByteParam.java index 96b46c4313..b0e1173572 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ByteParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ByteParam.java @@ -18,6 +18,9 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; + +@InterfaceAudience.Private public abstract class ByteParam extends Param { public ByteParam(String name, Byte defaultValue) { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/EnumParam.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/EnumParam.java index f605bd2220..d76db629b2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/EnumParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/EnumParam.java @@ -18,10 +18,12 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.util.StringUtils; import java.util.Arrays; +@InterfaceAudience.Private public abstract class EnumParam> extends Param { Class klass; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ExceptionProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ExceptionProvider.java index 9c21c6a536..bd9faa8ee9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ExceptionProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ExceptionProvider.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.http.client.HttpFSFileSystem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,6 +29,7 @@ import java.util.LinkedHashMap; import java.util.Map; +@InterfaceAudience.Private public class ExceptionProvider implements ExceptionMapper { private static Logger LOG = LoggerFactory.getLogger(ExceptionProvider.class); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/InputStreamEntity.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/InputStreamEntity.java index 21c25bd4c5..9edb24a7bc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/InputStreamEntity.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/InputStreamEntity.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.io.IOUtils; import javax.ws.rs.core.StreamingOutput; @@ -25,6 +26,7 @@ import java.io.InputStream; import java.io.OutputStream; +@InterfaceAudience.Private public class InputStreamEntity implements StreamingOutput { private InputStream is; private long offset; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/IntegerParam.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/IntegerParam.java index 7c0f0813c5..faa99a440e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/IntegerParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/IntegerParam.java @@ -18,6 +18,9 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; + +@InterfaceAudience.Private public abstract class IntegerParam extends Param { public IntegerParam(String name, Integer defaultValue) { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONMapProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONMapProvider.java index 0ca62fafb0..12a2fc680b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONMapProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONMapProvider.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; import org.json.simple.JSONObject; import javax.ws.rs.Produces; @@ -36,6 +37,7 @@ @Provider @Produces(MediaType.APPLICATION_JSON) +@InterfaceAudience.Private public class JSONMapProvider implements MessageBodyWriter { private static final String ENTER = System.getProperty("line.separator"); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONProvider.java index 34aa2f9a08..692643eec2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/JSONProvider.java @@ -18,6 +18,7 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; import org.json.simple.JSONStreamAware; import javax.ws.rs.Produces; @@ -35,6 +36,7 @@ @Provider @Produces(MediaType.APPLICATION_JSON) +@InterfaceAudience.Private public class JSONProvider implements MessageBodyWriter { private static final String ENTER = System.getProperty("line.separator"); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/LongParam.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/LongParam.java index ec601bb2ef..c2399bf76b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/LongParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/LongParam.java @@ -18,6 +18,9 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; + +@InterfaceAudience.Private public abstract class LongParam extends Param { public LongParam(String name, Long defaultValue) { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Param.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Param.java index 62af4818f8..f73c52fd5a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Param.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Param.java @@ -18,10 +18,11 @@ package org.apache.hadoop.lib.wsrs; -import org.apache.hadoop.lib.util.Check; +import org.apache.hadoop.classification.InterfaceAudience; import java.text.MessageFormat; +@InterfaceAudience.Private public abstract class Param { private String name; protected T value; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java index b5ec214d7a..a234d866c7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java @@ -17,6 +17,8 @@ */ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; + import java.util.Map; /** @@ -24,6 +26,7 @@ *

    * Instances are created by the {@link ParametersProvider} class. */ +@InterfaceAudience.Private public class Parameters { private Map> params; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java index 3d41d991ad..6541fb7733 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java @@ -24,6 +24,7 @@ import com.sun.jersey.server.impl.inject.AbstractHttpContextInjectable; import com.sun.jersey.spi.inject.Injectable; import com.sun.jersey.spi.inject.InjectableProvider; +import org.apache.hadoop.classification.InterfaceAudience; import javax.ws.rs.core.Context; import javax.ws.rs.core.MultivaluedMap; @@ -36,6 +37,7 @@ * Jersey provider that parses the request parameters based on the * given parameter definition. */ +@InterfaceAudience.Private public class ParametersProvider extends AbstractHttpContextInjectable implements InjectableProvider { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ShortParam.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ShortParam.java index 85591deb8f..7986e72bdb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ShortParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ShortParam.java @@ -18,6 +18,9 @@ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; + +@InterfaceAudience.Private public abstract class ShortParam extends Param { private int radix; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/StringParam.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/StringParam.java index 79e633697f..85bee1c901 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/StringParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/StringParam.java @@ -17,9 +17,12 @@ */ package org.apache.hadoop.lib.wsrs; +import org.apache.hadoop.classification.InterfaceAudience; + import java.text.MessageFormat; import java.util.regex.Pattern; +@InterfaceAudience.Private public abstract class StringParam extends Param { private Pattern pattern; diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java index b4c0e9a9d9..8310b00d9d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java @@ -24,6 +24,7 @@ import com.sun.jersey.server.impl.inject.AbstractHttpContextInjectable; import com.sun.jersey.spi.inject.Injectable; import com.sun.jersey.spi.inject.InjectableProvider; +import org.apache.hadoop.classification.InterfaceAudience; import org.slf4j.MDC; import javax.ws.rs.core.Context; @@ -33,6 +34,7 @@ import java.util.regex.Pattern; @Provider +@InterfaceAudience.Private public class UserProvider extends AbstractHttpContextInjectable implements InjectableProvider {