deal the checkstyle

Author: zhuxiangyi

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java

@@ -126,7 +126,8 @@ public void authorize(UserGroupInformation user,
     }
     if (addr != null) {
       String hostAddress = addr.getHostAddress();
-      if (hosts.length != 2 || !hosts[0].includes(hostAddress, user.getUserName()) ||
+      if (hosts.length != 2 ||
+          !hosts[0].includes(hostAddress, user.getUserName()) ||
           hosts[1].includes(hostAddress, user.getUserName())) {
         AUDITLOG.warn(AUTHZ_FAILED_FOR + " for protocol=" + protocol
             + " from host = " +  hostAddress);

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/MachineList.java

@@ -178,9 +178,6 @@ public boolean includes(String ipAddress, String user) {
     if (ipAddress == null) {
       throw new IllegalArgumentException("ipAddress is null.");
     }
-    if (all) {
-      return true;
-    }
     // iterate through the ip ranges for inclusion
     if (node != null) {
       String binaryIp = ipToBinaryNumber(ipAddress);
@@ -250,10 +247,10 @@ public Collection<String> getCollection() {
     return entries;
   }
 
-  private class TrieTree {
+  final private static class TrieTree {
     private Node root;
 
-    final private class Node {
+    final private static class Node {
       private boolean netRange;
       private HashSet<String> userSet;
       private Node[] children;
@@ -317,7 +314,7 @@ private boolean search(String binaryIP, String user) {
    * @param ipAddress A ip.
    * @return A binary mask.
    */
-  public static String ipToBinaryNumber(String ipAddress) {
+  private static String ipToBinaryNumber(String ipAddress) {
     String[] octetArray = ipAddress.split("\\.");
     StringBuilder binaryNumber = new StringBuilder();
     for (String str : octetArray) {
@@ -335,7 +332,7 @@ public static String ipToBinaryNumber(String ipAddress) {
     return binaryNumber.toString();
   }
 
-  public String subtractBinaryNumber(String s, int size) {
+  private String subtractBinaryNumber(String s, int size) {
     return s.substring(0, size);
   }
 
@@ -345,7 +342,7 @@ public String subtractBinaryNumber(String s, int size) {
    * @param ip A ip
    * @return if the given string is a Ipv4 false otherwise.
    */
-  public static boolean isValidIPv4(String ip) {
+  private static boolean isValidIPv4(String ip) {
     if (ip.length() < 7) {
       return false;
     }
@@ -367,7 +364,7 @@ public static boolean isValidIPv4(String ip) {
     return true;
   }
 
-  public static boolean isValidIPv4Segment(String token) {
+  private static boolean isValidIPv4Segment(String token) {
     if (token.startsWith("0") && token.length() > 1) {
       return false;
     }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestServiceAuthorization.java

@@ -381,7 +381,7 @@ public void testDefaultBlockedMachineList() throws UnknownHostException {
     // TestProtocol1 can be accessed from "1.2.3.4" because it uses default block list
     try {
       serviceAuthorizationManager.authorize(drwho,
-         TestProtocol1.class, conf, InetAddress.getByName("192.168.1.1"));
+          TestProtocol1.class, conf, InetAddress.getByName("192.168.1.1"));
     } catch (AuthorizationException e) {
       fail();
     }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestMachineList.java

@@ -43,9 +43,11 @@ public class TestMachineList {
     "10.222.0.0/16,10.119.103.110,10.119.103.112,10.119.103.114,10.241.23.0/24";
   private static String HOST_LIST = "host1,host4";
   private static String HOSTNAME_IP_USER_CIDR_LIST =
-      "host1:user1|user2,10.222.0.0/16:user1|user2,10.119.103.110:*,10.119.103.111";
+      "host1:user1|user2,10.222.0.0/16:user1|" +
+          "user2,10.119.103.110:*,10.119.103.111";
   private static String HOSTNAME_IP_CIDR_LIST =
-    "host1,10.222.0.0/16,10.119.103.110,10.119.103.112,10.119.103.114,10.241.23.0/24,host4,";
+    "host1,10.222.0.0/16,10.119.103.110," +
+        "10.119.103.112,10.119.103.114,10.241.23.0/24,host4,";
 
   class TestAddressFactory extends MachineList.InetAddressFactory {
     private Map<String, InetAddress> cache = new HashMap<>();
@@ -222,7 +224,8 @@ public void testIpWithUser() throws UnknownHostException {
     TestAddressFactory addressFactory = new TestAddressFactory();
     addressFactory.put("192.168.1.2", "host1");
     //create MachineList with a list of of ip ranges specified in CIDR format
-    MachineList ml = new MachineList(HOSTNAME_IP_USER_CIDR_LIST, addressFactory);
+    MachineList ml =
+        new MachineList(HOSTNAME_IP_USER_CIDR_LIST, addressFactory);
     // test IPHost
     assertTrue(ml.includes("192.168.1.2", "user1"));
     assertFalse(ml.includes("192.168.1.2", "user3"));