HADOOP-4572. Change INode and its sub-classes to package private. (szetszwo)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@711654 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -58,6 +58,8 @@ Trunk (unreleased changes)
     HADOOP-4437. Use Halton sequence instead of java.util.Random in PiEstimator.
     (szetszwo)
 
+    HADOOP-4572. Change INode and its sub-classes to package private. (szetszwo)
+
   OPTIMIZATIONS
 
   BUG FIXES

src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java

@@ -33,7 +33,7 @@ import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
  * This is a base INode class containing common fields for file and 
  * directory inodes.
  */
-public abstract class INode implements Comparable<byte[]> {
+abstract class INode implements Comparable<byte[]> {
   protected byte[] name;
   protected INodeDirectory parent;
   protected long modificationTime;

src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java

@@ -30,7 +30,7 @@ import org.apache.hadoop.hdfs.protocol.Block;
 /**
  * Directory INode class.
  */
-public class INodeDirectory extends INode {
+class INodeDirectory extends INode {
   protected static final int DEFAULT_FILES_PER_DIRECTORY = 5;
   final static String ROOT_NAME = "";
 

src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFile.java

@@ -26,7 +26,7 @@ import org.apache.hadoop.fs.permission.PermissionStatus;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 
-public class INodeFile extends INode {
+class INodeFile extends INode {
   static final FsPermission UMASK = FsPermission.createImmutable((short)0111);
 
   protected BlockInfo blocks[] = null;

src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java

@@ -24,7 +24,7 @@ import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
 
 
-public class INodeFileUnderConstruction extends INodeFile {
+class INodeFileUnderConstruction extends INodeFile {
   final String clientName;         // lease holder
   private final String clientMachine;
   private final DatanodeDescriptor clientNode; // if client is a cluster node too.

src/test/org/apache/hadoop/hdfs/CreateEditsLog.java → src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java

@@ -15,22 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
 
 import java.io.File;
 import java.io.IOException;
 
-
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.permission.PermissionStatus;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.server.common.GenerationStamp;
 import org.apache.hadoop.hdfs.server.common.Storage;
-import org.apache.hadoop.hdfs.server.namenode.FSEditLog;
-import org.apache.hadoop.hdfs.server.namenode.FSImage;
-import org.apache.hadoop.hdfs.server.namenode.INodeDirectory;
-import org.apache.hadoop.hdfs.server.namenode.INodeFileUnderConstruction;
 import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.fs.permission.PermissionStatus;
 
 /**
  * 

src/test/org/apache/hadoop/hdfs/FileNameGenerator.java → src/test/org/apache/hadoop/hdfs/server/namenode/FileNameGenerator.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
 
 import java.util.Arrays;
 

src/test/org/apache/hadoop/hdfs/NNThroughputBenchmark.java → src/test/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java

@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.ArrayList;
 
 import javax.security.auth.login.LoginException;
 
@@ -38,9 +38,6 @@ import org.apache.hadoop.hdfs.protocol.FSConstants;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.DataStorage;
-import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
-import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
 import org.apache.hadoop.hdfs.server.protocol.BlockCommand;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeCommand;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeProtocol;
@@ -48,8 +45,9 @@ import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
 import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
 import org.apache.hadoop.net.DNS;
 import org.apache.hadoop.net.NetworkTopology;
+import org.apache.hadoop.security.UnixUserGroupInformation;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.security.*;
 import org.apache.log4j.Level;
 
 /**

src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java → src/test/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java

@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
 
 import java.util.Arrays;
 
 import junit.framework.TestCase;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.hdfs.server.namenode.NameNode;
 
 public class TestNNThroughputBenchmark extends TestCase {