Skip to content

Commit 31f4a55

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

File tree

3 files changed

+37
-40
lines changed

3 files changed

+37
-40
lines changed

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -919,8 +919,9 @@ public Void call() throws Exception {
919919
kpce.rollNewVersion("k6");
920920
kpce.invalidateCache("k6");
921921
EncryptedKeyVersion ekv2 = kpce.generateEncryptedKey("k6");
922-
assertNotEquals(ekv1.getEncryptionKeyVersionName()
923-
, ekv2.getEncryptionKeyVersionName(), "rollover did not generate a new key even after"
922+
assertNotEquals(ekv1.getEncryptionKeyVersionName(),
923+
ekv2.getEncryptionKeyVersionName(),
924+
"rollover did not generate a new key even after"
924925
+ " queue is drained");
925926
return null;
926927
}
@@ -964,22 +965,22 @@ public Void call() throws Exception {
964965
KeyProvider.KeyVersion kv0 = kmscp.createKey(keyName, options);
965966
assertNotNull(kv0.getVersionName());
966967

967-
assertEquals("k1@0",
968-
kmscp.generateEncryptedKey(keyName).getEncryptionKeyVersionName(), "Default key version name is incorrect.");
968+
assertEquals("k1@0", kmscp.generateEncryptedKey(keyName).getEncryptionKeyVersionName(),
969+
"Default key version name is incorrect.");
969970

970971
kmscp.invalidateCache(keyName);
971972
kq.get(keyName).put(mockEKV);
972-
assertEquals(mockVersionName
973-
, kmscp.generateEncryptedKey(keyName).getEncryptionKeyVersionName(), "Key version incorrect after invalidating cache + putting"
974-
+ " mock key.");
973+
assertEquals(mockVersionName,
974+
kmscp.generateEncryptedKey(keyName).getEncryptionKeyVersionName(),
975+
"Key version incorrect after invalidating cache + putting"
976+
+ " mock key.");
975977

976978
// test new version is returned after invalidation.
977979
for (int i = 0; i < 100; ++i) {
978980
kq.get(keyName).put(mockEKV);
979981
kmscp.invalidateCache(keyName);
980-
assertEquals("k1@0",
981-
kmscp.generateEncryptedKey(keyName)
982-
.getEncryptionKeyVersionName(), "Cache invalidation guarantee failed.");
982+
assertEquals("k1@0", kmscp.generateEncryptedKey(keyName)
983+
.getEncryptionKeyVersionName(), "Cache invalidation guarantee failed.");
983984
}
984985
return null;
985986
}
@@ -1421,9 +1422,8 @@ public Void run() throws Exception {
14211422
new KeyProvider.Options(conf));
14221423
fail("This should not succeed..");
14231424
} catch (IOException e) {
1424-
assertTrue(
1425-
e
1426-
.getMessage().contains("401"), "HTTP exception must be a 401 : " + e.getMessage());
1425+
assertTrue(e.getMessage().contains("401"),
1426+
"HTTP exception must be a 401 : " + e.getMessage());
14271427
}
14281428
return null;
14291429
}
@@ -2192,11 +2192,10 @@ public void testDelegationTokensOpsHttpsKerberized() throws Exception {
21922192
}
21932193

21942194
private Text getTokenService(KeyProvider provider) {
2195-
assertTrue((provider instanceof
2196-
LoadBalancingKMSClientProvider), "KeyProvider should be an instance of " +
2197-
"LoadBalancingKMSClientProvider");
2198-
assertEquals(1
2199-
, ((LoadBalancingKMSClientProvider)provider).getProviders().length, "Num client providers should be 1");
2195+
assertTrue((provider instanceof LoadBalancingKMSClientProvider),
2196+
"KeyProvider should be an instance of " + "LoadBalancingKMSClientProvider");
2197+
assertEquals(1, ((LoadBalancingKMSClientProvider)provider).getProviders().length,
2198+
"Num client providers should be 1");
22002199
final Text tokenService = new Text(
22012200
(((LoadBalancingKMSClientProvider)provider).getProviders()[0])
22022201
.getCanonicalServiceName());
@@ -2402,8 +2401,8 @@ public Void run() throws Exception {
24022401

24032402
// wait for token to expire.
24042403
Thread.sleep(5100);
2405-
assertTrue(
2406-
maxTime > 0 && maxTime < Time.now(), "maxTime " + maxTime + " is not less than now.");
2404+
assertTrue(maxTime > 0 && maxTime < Time.now(),
2405+
"maxTime " + maxTime + " is not less than now.");
24072406
try {
24082407
kp.getKeys();
24092408
fail("Operation should fail since dt is expired.");

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.io.OutputStream;
2525
import java.io.PrintStream;
2626
import java.util.List;
27-
import java.util.concurrent.TimeUnit;
2827

2928
import org.apache.commons.lang3.reflect.FieldUtils;
3029
import org.apache.hadoop.conf.Configuration;

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -221,27 +221,26 @@ private static KeyProvider.Options newOptions(Configuration conf) {
221221
@Test
222222
public void testDecryptWithKeyVersionNameKeyMismatch() throws Exception {
223223
assertThrows(IllegalArgumentException.class, () -> {
224-
final Configuration conf = new Configuration();
225-
KeyProvider kp =
226-
new UserProvider.Factory().createProvider(new URI("user:///"), conf);
227-
KeyACLs mock = mock(KeyACLs.class);
228-
when(mock.isACLPresent("testKey", KeyOpType.MANAGEMENT)).thenReturn(true);
229-
when(mock.isACLPresent("testKey", KeyOpType.GENERATE_EEK)).thenReturn(true);
230-
when(mock.isACLPresent("testKey", KeyOpType.DECRYPT_EEK)).thenReturn(true);
231-
when(mock.isACLPresent("testKey", KeyOpType.ALL)).thenReturn(true);
232-
UserGroupInformation u1 = UserGroupInformation.createRemoteUser("u1");
233-
UserGroupInformation u2 = UserGroupInformation.createRemoteUser("u2");
234-
UserGroupInformation u3 = UserGroupInformation.createRemoteUser("u3");
235-
UserGroupInformation sudo = UserGroupInformation.createRemoteUser("sudo");
236-
when(mock.hasAccessToKey("testKey", u1,
224+
final Configuration conf = new Configuration();
225+
KeyProvider kp = new UserProvider.Factory().createProvider(new URI("user:///"), conf);
226+
KeyACLs mock = mock(KeyACLs.class);
227+
when(mock.isACLPresent("testKey", KeyOpType.MANAGEMENT)).thenReturn(true);
228+
when(mock.isACLPresent("testKey", KeyOpType.GENERATE_EEK)).thenReturn(true);
229+
when(mock.isACLPresent("testKey", KeyOpType.DECRYPT_EEK)).thenReturn(true);
230+
when(mock.isACLPresent("testKey", KeyOpType.ALL)).thenReturn(true);
231+
UserGroupInformation u1 = UserGroupInformation.createRemoteUser("u1");
232+
UserGroupInformation u2 = UserGroupInformation.createRemoteUser("u2");
233+
UserGroupInformation u3 = UserGroupInformation.createRemoteUser("u3");
234+
UserGroupInformation sudo = UserGroupInformation.createRemoteUser("sudo");
235+
when(mock.hasAccessToKey("testKey", u1,
237236
KeyOpType.MANAGEMENT)).thenReturn(true);
238-
when(mock.hasAccessToKey("testKey", u2,
237+
when(mock.hasAccessToKey("testKey", u2,
239238
KeyOpType.GENERATE_EEK)).thenReturn(true);
240-
when(mock.hasAccessToKey("testKey", u3,
239+
when(mock.hasAccessToKey("testKey", u3,
241240
KeyOpType.DECRYPT_EEK)).thenReturn(true);
242-
when(mock.hasAccessToKey("testKey", sudo,
241+
when(mock.hasAccessToKey("testKey", sudo,
243242
KeyOpType.ALL)).thenReturn(true);
244-
final KeyProviderCryptoExtension kpExt =
243+
final KeyProviderCryptoExtension kpExt =
245244
new KeyAuthorizationKeyProvider(
246245
KeyProviderCryptoExtension.createKeyProviderCryptoExtension(kp),
247246
mock);
@@ -267,7 +266,7 @@ public Void run() throws Exception {
267266
return null;
268267
}
269268
}
270-
);
271-
});
269+
);
270+
});
272271
}
273272
}

0 commit comments

Comments
 (0)