@@ -919,8 +919,9 @@ public Void call() throws Exception {
919
919
kpce .rollNewVersion ("k6" );
920
920
kpce .invalidateCache ("k6" );
921
921
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"
924
925
+ " queue is drained" );
925
926
return null ;
926
927
}
@@ -964,22 +965,22 @@ public Void call() throws Exception {
964
965
KeyProvider .KeyVersion kv0 = kmscp .createKey (keyName , options );
965
966
assertNotNull (kv0 .getVersionName ());
966
967
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." );
969
970
970
971
kmscp .invalidateCache (keyName );
971
972
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." );
975
977
976
978
// test new version is returned after invalidation.
977
979
for (int i = 0 ; i < 100 ; ++i ) {
978
980
kq .get (keyName ).put (mockEKV );
979
981
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." );
983
984
}
984
985
return null ;
985
986
}
@@ -1421,9 +1422,8 @@ public Void run() throws Exception {
1421
1422
new KeyProvider .Options (conf ));
1422
1423
fail ("This should not succeed.." );
1423
1424
} 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 ());
1427
1427
}
1428
1428
return null ;
1429
1429
}
@@ -2192,11 +2192,10 @@ public void testDelegationTokensOpsHttpsKerberized() throws Exception {
2192
2192
}
2193
2193
2194
2194
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" );
2200
2199
final Text tokenService = new Text (
2201
2200
(((LoadBalancingKMSClientProvider )provider ).getProviders ()[0 ])
2202
2201
.getCanonicalServiceName ());
@@ -2402,8 +2401,8 @@ public Void run() throws Exception {
2402
2401
2403
2402
// wait for token to expire.
2404
2403
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." );
2407
2406
try {
2408
2407
kp .getKeys ();
2409
2408
fail ("Operation should fail since dt is expired." );
0 commit comments