Author: mahadev
Date: Sun Jul 24 16:37:11 2011
New Revision: 1150431
URL: http://svn.apache.org/viewvc?rev=1150431&view=rev
Log:
HADOOP-6929. Making Security Info abstract and not an interface (mahadev)
Modified:
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/SecurityInfo.java
hadoop/common/branches/MR-279/common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java
Modified:
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java?rev=1150431&r1=1150430&r2=1150431&view=diff
==============================================================================
---
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java
(original)
+++
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/AnnotatedSecurityInfo.java
Sun Jul 24 16:37:11 2011
@@ -24,7 +24,7 @@ import org.apache.hadoop.security.token.
/**
* 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) {
Modified:
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/SecurityInfo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/SecurityInfo.java?rev=1150431&r1=1150430&r2=1150431&view=diff
==============================================================================
---
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/SecurityInfo.java
(original)
+++
hadoop/common/branches/MR-279/common/src/java/org/apache/hadoop/security/SecurityInfo.java
Sun Jul 24 16:37:11 2011
@@ -29,7 +29,7 @@ import org.apache.hadoop.security.token.
* 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);
}
Modified:
hadoop/common/branches/MR-279/common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java?rev=1150431&r1=1150430&r2=1150431&view=diff
==============================================================================
---
hadoop/common/branches/MR-279/common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java
(original)
+++
hadoop/common/branches/MR-279/common/src/test/core/org/apache/hadoop/ipc/TestSaslRPC.java
Sun Jul 24 16:37:11 2011
@@ -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)
{
