Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10866. Fix Eclipse Java compile errors related to generic parameters. Contributed by Konstantin Shvachko.

This commit is contained in:
Konstantin V Shvachko 2016-09-23 11:25:15 -07:00
parent 74b3dd514c
commit 6eb700ee74
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapFile.java
View File

@ -990,8 +990,8 @@ public class MapFile {
reader.getKeyClass().asSubclass(WritableComparable.class), reader.getKeyClass().asSubclass(WritableComparable.class),
reader.getValueClass()); reader.getValueClass());
WritableComparable key = ReflectionUtils.newInstance(reader.getKeyClass() WritableComparable<?> key = ReflectionUtils.newInstance(
.asSubclass(WritableComparable.class), conf); reader.getKeyClass().asSubclass(WritableComparable.class), conf);
Writable value = ReflectionUtils.newInstance(reader.getValueClass() Writable value = ReflectionUtils.newInstance(reader.getValueClass()
.asSubclass(Writable.class), conf); .asSubclass(Writable.class), conf);

3
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDelegationTokenRenewer.java
View File

@ -49,7 +49,6 @@ public class TestDelegationTokenRenewer {
renewer = DelegationTokenRenewer.getInstance(); renewer = DelegationTokenRenewer.getInstance();
} }
@SuppressWarnings("unchecked")
@Test @Test
public void testAddRemoveRenewAction() throws IOException, public void testAddRemoveRenewAction() throws IOException,
InterruptedException { InterruptedException {
@ -81,7 +80,7 @@ public class TestDelegationTokenRenewer {
verify(token).cancel(eq(conf)); verify(token).cancel(eq(conf));
verify(fs, never()).getDelegationToken(null); verify(fs, never()).getDelegationToken(null);
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
assertEquals("FileSystem not removed from DelegationTokenRenewer", 0, assertEquals("FileSystem not removed from DelegationTokenRenewer", 0,
renewer.getRenewQueueLength()); renewer.getRenewQueueLength());

27
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java
View File

@ -127,7 +127,7 @@ public class TestWebHdfsTokens {
fs.toUrl(op, null); fs.toUrl(op, null);
verify(fs, never()).getDelegationToken(); verify(fs, never()).getDelegationToken();
verify(fs, never()).getDelegationToken(null); verify(fs, never()).getDelegationToken(null);
verify(fs, never()).setDelegationToken((Token<?>)any(Token.class)); verify(fs, never()).setDelegationToken(any());
} }
@Test(timeout = 1000) @Test(timeout = 1000)
@ -160,7 +160,6 @@ public class TestWebHdfsTokens {
} }
} }
@SuppressWarnings("unchecked") // for any(Token.class)
@Test @Test
public void testLazyTokenFetchForWebhdfs() throws Exception { public void testLazyTokenFetchForWebhdfs() throws Exception {
MiniDFSCluster cluster = null; MiniDFSCluster cluster = null;
@ -190,7 +189,6 @@ public class TestWebHdfsTokens {
} }
} }
@SuppressWarnings("unchecked") // for any(Token.class)
@Test @Test
public void testLazyTokenFetchForSWebhdfs() throws Exception { public void testLazyTokenFetchForSWebhdfs() throws Exception {
MiniDFSCluster cluster = null; MiniDFSCluster cluster = null;
@ -298,7 +296,6 @@ public class TestWebHdfsTokens {
} }
} }
@SuppressWarnings("unchecked")
private void validateLazyTokenFetch(final Configuration clusterConf) throws Exception{ private void validateLazyTokenFetch(final Configuration clusterConf) throws Exception{
final String testUser = "DummyUser"; final String testUser = "DummyUser";
UserGroupInformation ugi = UserGroupInformation.createUserForTesting( UserGroupInformation ugi = UserGroupInformation.createUserForTesting(
@ -316,7 +313,7 @@ public class TestWebHdfsTokens {
fs.cancelDelegationToken(token); fs.cancelDelegationToken(token);
verify(fs, never()).getDelegationToken(); verify(fs, never()).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
Assert.assertNull(fs.getRenewToken()); Assert.assertNull(fs.getRenewToken());
reset(fs); reset(fs);
@ -326,7 +323,7 @@ public class TestWebHdfsTokens {
verify(fs, times(1)).getDelegationToken(); verify(fs, times(1)).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, times(1)).getDelegationToken(anyString()); verify(fs, times(1)).getDelegationToken(anyString());
verify(fs, times(1)).setDelegationToken(any(Token.class)); verify(fs, times(1)).setDelegationToken(any());
token = fs.getRenewToken(); token = fs.getRenewToken();
Assert.assertNotNull(token); Assert.assertNotNull(token);
Assert.assertEquals(testUser, getTokenOwner(token)); Assert.assertEquals(testUser, getTokenOwner(token));
@ -338,7 +335,7 @@ public class TestWebHdfsTokens {
verify(fs, times(1)).getDelegationToken(); verify(fs, times(1)).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, never()).getDelegationToken(anyString()); verify(fs, never()).getDelegationToken(anyString());
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
Token<?> token2 = fs.getRenewToken(); Token<?> token2 = fs.getRenewToken();
Assert.assertNotNull(token2); Assert.assertNotNull(token2);
Assert.assertEquals(fs.getTokenKind(), token.getKind()); Assert.assertEquals(fs.getTokenKind(), token.getKind());
@ -358,7 +355,7 @@ public class TestWebHdfsTokens {
verify(fs, never()).getDelegationToken(); verify(fs, never()).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, never()).getDelegationToken(anyString()); verify(fs, never()).getDelegationToken(anyString());
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
token2 = fs.getRenewToken(); token2 = fs.getRenewToken();
Assert.assertNotNull(token2); Assert.assertNotNull(token2);
Assert.assertEquals(fs.getTokenKind(), token.getKind()); Assert.assertEquals(fs.getTokenKind(), token.getKind());
@ -376,7 +373,7 @@ public class TestWebHdfsTokens {
verify(fs, never()).getDelegationToken(); verify(fs, never()).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, never()).getDelegationToken(anyString()); verify(fs, never()).getDelegationToken(anyString());
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
token2 = fs.getRenewToken(); token2 = fs.getRenewToken();
Assert.assertNotNull(token2); Assert.assertNotNull(token2);
Assert.assertEquals(fs.getTokenKind(), token.getKind()); Assert.assertEquals(fs.getTokenKind(), token.getKind());
@ -390,7 +387,7 @@ public class TestWebHdfsTokens {
verify(fs, times(2)).getDelegationToken(); // first bad, then good verify(fs, times(2)).getDelegationToken(); // first bad, then good
verify(fs, times(1)).replaceExpiredDelegationToken(); verify(fs, times(1)).replaceExpiredDelegationToken();
verify(fs, times(1)).getDelegationToken(null); verify(fs, times(1)).getDelegationToken(null);
verify(fs, times(1)).setDelegationToken(any(Token.class)); verify(fs, times(1)).setDelegationToken(any());
token2 = fs.getRenewToken(); token2 = fs.getRenewToken();
Assert.assertNotNull(token2); Assert.assertNotNull(token2);
Assert.assertNotSame(token, token2); Assert.assertNotSame(token, token2);
@ -407,7 +404,7 @@ public class TestWebHdfsTokens {
verify(fs, times(2)).getDelegationToken(); // first bad, then good verify(fs, times(2)).getDelegationToken(); // first bad, then good
verify(fs, times(1)).replaceExpiredDelegationToken(); verify(fs, times(1)).replaceExpiredDelegationToken();
verify(fs, times(1)).getDelegationToken(null); verify(fs, times(1)).getDelegationToken(null);
verify(fs, times(1)).setDelegationToken(any(Token.class)); verify(fs, times(1)).setDelegationToken(any());
token2 = fs.getRenewToken(); token2 = fs.getRenewToken();
Assert.assertNotNull(token2); Assert.assertNotNull(token2);
Assert.assertNotSame(token, token2); Assert.assertNotSame(token, token2);
@ -420,7 +417,7 @@ public class TestWebHdfsTokens {
verify(fs, never()).getDelegationToken(); verify(fs, never()).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, never()).getDelegationToken(anyString()); verify(fs, never()).getDelegationToken(anyString());
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
verify(fs, times(1)).cancelDelegationToken(eq(token2)); verify(fs, times(1)).cancelDelegationToken(eq(token2));
// add a token to ugi for a new fs, verify it uses that token // add a token to ugi for a new fs, verify it uses that token
@ -449,7 +446,7 @@ public class TestWebHdfsTokens {
verify(fs, times(1)).getDelegationToken(); verify(fs, times(1)).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, never()).getDelegationToken(anyString()); verify(fs, never()).getDelegationToken(anyString());
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
token2 = fs.getRenewToken(); token2 = fs.getRenewToken();
Assert.assertNotNull(token2); Assert.assertNotNull(token2);
Assert.assertEquals(fs.getTokenKind(), token.getKind()); Assert.assertEquals(fs.getTokenKind(), token.getKind());
@ -469,7 +466,7 @@ public class TestWebHdfsTokens {
verify(fs, times(1)).getDelegationToken(); verify(fs, times(1)).getDelegationToken();
verify(fs, times(1)).replaceExpiredDelegationToken(); verify(fs, times(1)).replaceExpiredDelegationToken();
verify(fs, never()).getDelegationToken(anyString()); verify(fs, never()).getDelegationToken(anyString());
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
token2 = fs.getRenewToken(); token2 = fs.getRenewToken();
Assert.assertNotNull(token2); Assert.assertNotNull(token2);
Assert.assertEquals(fs.getTokenKind(), token.getKind()); Assert.assertEquals(fs.getTokenKind(), token.getKind());
@ -482,7 +479,7 @@ public class TestWebHdfsTokens {
verify(fs, never()).getDelegationToken(); verify(fs, never()).getDelegationToken();
verify(fs, never()).replaceExpiredDelegationToken(); verify(fs, never()).replaceExpiredDelegationToken();
verify(fs, never()).getDelegationToken(anyString()); verify(fs, never()).getDelegationToken(anyString());
verify(fs, never()).setDelegationToken(any(Token.class)); verify(fs, never()).setDelegationToken(any());
verify(fs, never()).cancelDelegationToken(any(Token.class)); verify(fs, never()).cancelDelegationToken(any(Token.class));
} }