HADOOP-6929. Making Security Info abstract and not an interface (mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1150431 13f79535-47bb-0310-9956-ffa450edef68

common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java

@@ -24,7 +24,7 @@ import org.apache.hadoop.security.token.TokenInfo;
 /**
  * Constructs SecurityInfo from Annotations provided in protocol interface.
  */
-public class AnnotatedSecurityInfo implements SecurityInfo {
+public class AnnotatedSecurityInfo extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

common/src/java/org/apache/hadoop/security/SecurityInfo.java

@@ -29,7 +29,7 @@ import org.apache.hadoop.security.token.TokenInfo;
  * Interface used by RPC to get the Security information for a given 
  * protocol.
  */
-public interface SecurityInfo {
+public abstract class SecurityInfo {
 
   /**
    * Get the KerberosInfo for a given protocol.
@@ -37,7 +37,7 @@ public interface SecurityInfo {
    * @param conf configuration object
    * @return KerberosInfo
    */
-  KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf);
+  public abstract KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf);
 
   /**
    * Get the TokenInfo for a given protocol.
@@ -45,6 +45,6 @@ public interface SecurityInfo {
    * @param conf configuration object
    * @return TokenInfo instance
    */
-  TokenInfo getTokenInfo(Class<?> protocol, Configuration conf);
+  public abstract TokenInfo getTokenInfo(Class<?> protocol, Configuration conf);
 
 }

common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java

@@ -191,7 +191,7 @@ public class TestSaslRPC {
     }
   }
 
-  public static class CustomSecurityInfo  implements SecurityInfo {
+  public static class CustomSecurityInfo  extends SecurityInfo {
 
     @Override
     public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

mapreduce/CHANGES.txt

@@ -4,6 +4,8 @@ Trunk (unreleased changes)
 
 
     MAPREDUCE-279
+    
+    HADOOP-6929. Making Security Info abstract and not an interface (mahadev)
 
     HADOOP-6929. Backport changes to MR-279 (mahadev and owen)
     

mapreduce/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java

@@ -26,7 +26,7 @@ import org.apache.hadoop.security.KerberosInfo;
 import org.apache.hadoop.security.SecurityInfo;
 import org.apache.hadoop.security.token.TokenInfo;
 
-public class ClientHSSecurityInfo implements SecurityInfo {
+public class ClientHSSecurityInfo extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/TunnelProtocolSecurityInfo.java

@@ -10,7 +10,7 @@ import org.apache.hadoop.security.token.TokenInfo;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.ipc.ProtoOverHadoopRpcEngine.TunnelProtocol;
 
-public class TunnelProtocolSecurityInfo implements SecurityInfo {
+public class TunnelProtocolSecurityInfo extends SecurityInfo {
   public static final Log LOG = LogFactory.getLog(TunnelProtocolSecurityInfo.class);
   
   @Override

mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerManagerSecurityInfo.java

@@ -27,7 +27,7 @@ import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenInfo;
 import org.apache.hadoop.security.token.TokenSelector;
 
-public class ContainerManagerSecurityInfo implements SecurityInfo {
+public class ContainerManagerSecurityInfo extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/SchedulerSecurityInfo.java

@@ -27,7 +27,7 @@ import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenInfo;
 import org.apache.hadoop.security.token.TokenSelector;
 
-public class SchedulerSecurityInfo implements SecurityInfo {
+public class SchedulerSecurityInfo extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/admin/AdminSecurityInfo.java

@@ -8,7 +8,7 @@ import org.apache.hadoop.security.SecurityInfo;
 import org.apache.hadoop.security.token.TokenInfo;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 
-public class AdminSecurityInfo implements SecurityInfo {
+public class AdminSecurityInfo extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

mapreduce/yarn/yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientRMSecurityInfo.java

@@ -26,7 +26,7 @@ import org.apache.hadoop.security.SecurityInfo;
 import org.apache.hadoop.security.token.TokenInfo;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 
-public class ClientRMSecurityInfo implements SecurityInfo {
+public class ClientRMSecurityInfo extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

mapreduce/yarn/yarn-server/yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/RMNMSecurityInfoClass.java

@@ -26,7 +26,7 @@ import org.apache.hadoop.security.SecurityInfo;
 import org.apache.hadoop.security.token.TokenInfo;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 
-public class RMNMSecurityInfoClass implements SecurityInfo {
+public class RMNMSecurityInfoClass extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {

mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/security/LocalizerSecurityInfo.java

@@ -27,7 +27,7 @@ import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenInfo;
 import org.apache.hadoop.security.token.TokenSelector;
 
-public class LocalizerSecurityInfo implements SecurityInfo {
+public class LocalizerSecurityInfo extends SecurityInfo {
 
   @Override
   public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {