Skip to content

Commit 4f6d91c

Browse files
committed
HADOOP-19416. Fix CheckStyle.
1 parent 31f4a55 commit 4f6d91c

File tree

2 files changed

+50
-50
lines changed

2 files changed

+50
-50
lines changed

hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java

+28-28
Original file line numberDiff line numberDiff line change
@@ -1633,38 +1633,38 @@ public Void run() throws Exception {
16331633

16341634
final KeyVersion currKv =
16351635
doAs("GET", new PrivilegedExceptionAction<KeyVersion>() {
1636-
@Override
1637-
public KeyVersion run() throws Exception {
1638-
KeyProvider kp = createProvider(uri, conf);
1639-
try {
1640-
kp.getKeyVersion("k1@0");
1641-
KeyVersion kv = kp.getCurrentKey("k1");
1642-
return kv;
1643-
} catch (Exception ex) {
1644-
fail(ex.toString());
1645-
}
1646-
return null;
1647-
}
1648-
});
1636+
@Override
1637+
public KeyVersion run() throws Exception {
1638+
KeyProvider kp = createProvider(uri, conf);
1639+
try {
1640+
kp.getKeyVersion("k1@0");
1641+
KeyVersion kv = kp.getCurrentKey("k1");
1642+
return kv;
1643+
} catch (Exception ex) {
1644+
fail(ex.toString());
1645+
}
1646+
return null;
1647+
}
1648+
});
16491649

16501650
final EncryptedKeyVersion encKv =
16511651
doAs("GENERATE_EEK",
16521652
new PrivilegedExceptionAction<EncryptedKeyVersion>() {
1653-
@Override
1654-
public EncryptedKeyVersion run() throws Exception {
1655-
KeyProvider kp = createProvider(uri, conf);
1656-
try {
1657-
KeyProviderCryptoExtension kpCE = KeyProviderCryptoExtension.
1658-
createKeyProviderCryptoExtension(kp);
1659-
EncryptedKeyVersion ek1 =
1660-
kpCE.generateEncryptedKey(currKv.getName());
1661-
return ek1;
1662-
} catch (Exception ex) {
1663-
fail(ex.toString());
1664-
}
1665-
return null;
1666-
}
1667-
});
1653+
@Override
1654+
public EncryptedKeyVersion run() throws Exception {
1655+
KeyProvider kp = createProvider(uri, conf);
1656+
try {
1657+
KeyProviderCryptoExtension kpCE = KeyProviderCryptoExtension.
1658+
createKeyProviderCryptoExtension(kp);
1659+
EncryptedKeyVersion ek1 =
1660+
kpCE.generateEncryptedKey(currKv.getName());
1661+
return ek1;
1662+
} catch (Exception ex) {
1663+
fail(ex.toString());
1664+
}
1665+
return null;
1666+
}
1667+
});
16681668

16691669
doAs("GENERATE_EEK", new PrivilegedExceptionAction<Void>() {
16701670
@Override

hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKeyAuthorizationKeyProvider.java

+22-22
Original file line numberDiff line numberDiff line change
@@ -241,31 +241,31 @@ public void testDecryptWithKeyVersionNameKeyMismatch() throws Exception {
241241
when(mock.hasAccessToKey("testKey", sudo,
242242
KeyOpType.ALL)).thenReturn(true);
243243
final KeyProviderCryptoExtension kpExt =
244-
new KeyAuthorizationKeyProvider(
244+
new KeyAuthorizationKeyProvider(
245245
KeyProviderCryptoExtension.createKeyProviderCryptoExtension(kp),
246246
mock);
247-
sudo.doAs(
248-
new PrivilegedExceptionAction<Void>() {
249-
@Override
250-
public Void run() throws Exception {
251-
Options opt = newOptions(conf);
252-
Map<String, String> m = new HashMap<String, String>();
253-
m.put("key.acl.name", "testKey");
254-
opt.setAttributes(m);
255-
KeyVersion kv =
256-
kpExt.createKey("foo", SecureRandom.getSeed(16), opt);
257-
kpExt.rollNewVersion(kv.getName());
258-
kpExt.rollNewVersion(kv.getName(), SecureRandom.getSeed(16));
259-
EncryptedKeyVersion ekv = kpExt.generateEncryptedKey(kv.getName());
260-
ekv = EncryptedKeyVersion.createForDecryption(
261-
ekv.getEncryptionKeyName() + "x",
262-
ekv.getEncryptionKeyVersionName(),
263-
ekv.getEncryptedKeyIv(),
264-
ekv.getEncryptedKeyVersion().getMaterial());
265-
kpExt.decryptEncryptedKey(ekv);
266-
return null;
247+
sudo.doAs(
248+
new PrivilegedExceptionAction<Void>() {
249+
@Override
250+
public Void run() throws Exception {
251+
Options opt = newOptions(conf);
252+
Map<String, String> m = new HashMap<String, String>();
253+
m.put("key.acl.name", "testKey");
254+
opt.setAttributes(m);
255+
KeyVersion kv =
256+
kpExt.createKey("foo", SecureRandom.getSeed(16), opt);
257+
kpExt.rollNewVersion(kv.getName());
258+
kpExt.rollNewVersion(kv.getName(), SecureRandom.getSeed(16));
259+
EncryptedKeyVersion ekv = kpExt.generateEncryptedKey(kv.getName());
260+
ekv = EncryptedKeyVersion.createForDecryption(
261+
ekv.getEncryptionKeyName() + "x",
262+
ekv.getEncryptionKeyVersionName(),
263+
ekv.getEncryptedKeyIv(),
264+
ekv.getEncryptedKeyVersion().getMaterial());
265+
kpExt.decryptEncryptedKey(ekv);
266+
return null;
267+
}
267268
}
268-
}
269269
);
270270
});
271271
}

0 commit comments

Comments
 (0)