You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/05/04 09:04:36 UTC
[2/2] jclouds git commit: Cleanup unused variables
Cleanup unused variables
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6a10544b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6a10544b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6a10544b
Branch: refs/heads/master
Commit: 6a10544b161fc0cdcd512146f24a7d689e695e9b
Parents: 7c59270
Author: Ignasi Barrera <na...@apache.org>
Authored: Fri May 4 09:27:39 2018 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Fri May 4 11:03:43 2018 +0200
----------------------------------------------------------------------
.../compute/config/AzurePredicatesModule.java | 6 -----
.../arm/features/VaultApiLiveTest.java | 23 +++++---------------
.../arm/features/VaultApiMockTest.java | 3 ---
3 files changed, 6 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6a10544b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
index c8dfd6e..9885075 100644
--- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
+++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzurePredicatesModule.java
@@ -330,7 +330,6 @@ public class AzurePredicatesModule extends AbstractModule {
@Override
public boolean apply(final String name) {
checkNotNull(name, "name cannot be null");
- boolean present = false;
List<Vault.DeletedVault> vaults = api.getVaultApi(resourceGroup).listDeletedVaults();
return shouldBePresent == Iterables.any(vaults, new Predicate<Vault.DeletedVault>() {
@Override public boolean apply(Vault.DeletedVault input) {
@@ -380,7 +379,6 @@ public class AzurePredicatesModule extends AbstractModule {
@Override
public boolean apply(final String name) {
checkNotNull(name, "name cannot be null");
- boolean present = false;
DeletedKeyBundle key = api.getVaultApi(resourceGroup).getDeletedKey(vaultUri, name);
return shouldBePresent == (key != null);
}
@@ -408,7 +406,6 @@ public class AzurePredicatesModule extends AbstractModule {
@Override
public boolean apply(final String name) {
checkNotNull(name, "name cannot be null");
- boolean result = false;
KeyBundle key = api.getVaultApi(resourceGroup).getKey(vaultUri, name);
return key != null ? (isRecovered ? true : key.attributes().recoveryLevel().contains("Recoverable")) : false;
}
@@ -453,7 +450,6 @@ public class AzurePredicatesModule extends AbstractModule {
return retry(new Predicate<String>() {
@Override
public boolean apply(final String name) {
- boolean present = false;
checkNotNull(name, "name cannot be null");
DeletedSecretBundle secret = api.getVaultApi(resourceGroup).getDeletedSecret(vaultUri, name);
return shouldBePresent == (secret != null);
@@ -534,7 +530,6 @@ public class AzurePredicatesModule extends AbstractModule {
return retry(new Predicate<String>() {
@Override
public boolean apply(final String name) {
- boolean present = false;
checkNotNull(name, "name cannot be null");
DeletedCertificateBundle cert = api.getVaultApi(resourceGroup).getDeletedCertificate(vaultUri, name);
return shouldBePresent == (cert != null);
@@ -591,7 +586,6 @@ public class AzurePredicatesModule extends AbstractModule {
@Override
public boolean apply(final String name) {
checkNotNull(name, "name cannot be null");
- boolean result = false;
CertificateOperation certOp = api.getVaultApi(resourceGroup).getCertificateOperation(vaultUri, name);
return isCreate ? ((certOp != null) ? !certOp.status().equals("inProgress") : false) : (certOp == null);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6a10544b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiLiveTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiLiveTest.java
index 026aa28..2c6b100 100644
--- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiLiveTest.java
+++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiLiveTest.java
@@ -318,17 +318,6 @@ public class VaultApiLiveTest extends BaseAzureComputeApiLiveTest {
@Test(dependsOnMethods = "testUpdateKey")
public void testListKeyVersions() {
- // Create a second version of the key
- KeyAttributes keyAttr = KeyAttributes.create(true, null, null, null, null, null);
- KeyBundle keyBundle = api().createKey(vaultUri,
- KEY_NAME,
- keyAttr,
- null,
- null,
- 3072,
- "RSA",
- null);
-
// List key versions
List<Key> keys = api().getKeyVersions(vaultUri, KEY_NAME);
assertNotNull(keys);
@@ -427,7 +416,7 @@ public class VaultApiLiveTest extends BaseAzureComputeApiLiveTest {
@Test(dependsOnMethods = {"testDeleteRecoverableKey", "testGetDeletedKey"})
public void testRecoverDeletedKey() {
- KeyBundle key = api().recoverDeletedKey(vaultUri, RECOVERABLE_KEY_NAME);
+ api().recoverDeletedKey(vaultUri, RECOVERABLE_KEY_NAME);
checkState(recoverableKeyStatus.create(resourceGroupName, vaultUri, true).apply(RECOVERABLE_KEY_NAME),
"key was not recovered before timeout");
}
@@ -435,7 +424,7 @@ public class VaultApiLiveTest extends BaseAzureComputeApiLiveTest {
@Test(dependsOnMethods = "testRecoverDeletedKey")
public void testPurgeDeletedKey() {
// delete the key
- DeletedKeyBundle dkb = api().deleteKey(vaultUri, RECOVERABLE_KEY_NAME);
+ api().deleteKey(vaultUri, RECOVERABLE_KEY_NAME);
checkState(deletedKeyStatus.create(resourceGroupName, vaultUri, true).apply(RECOVERABLE_KEY_NAME),
"key was not deleted before timeout");
@@ -559,7 +548,7 @@ public class VaultApiLiveTest extends BaseAzureComputeApiLiveTest {
public void testListSecretVersions() {
// Create a second version of the secret
SecretAttributes attributes = SecretAttributes.create(true, null, null, null, null, null);
- SecretBundle secretBundle = api().setSecret(vaultUri,
+ api().setSecret(vaultUri,
SECRET_NAME,
attributes,
"aNewSecretKey",
@@ -684,7 +673,7 @@ public class VaultApiLiveTest extends BaseAzureComputeApiLiveTest {
@Test(dependsOnMethods = {"testDeleteRecoverableSecret", "testGetDeletedSecret"})
public void testRecoverDeletedSecret() {
- SecretBundle secret = api().recoverDeletedSecret(vaultUri, RECOVERABLE_SECRET_NAME);
+ api().recoverDeletedSecret(vaultUri, RECOVERABLE_SECRET_NAME);
checkState(recoverableSecretStatus.create(resourceGroupName, vaultUri, true).apply(RECOVERABLE_SECRET_NAME),
"secret was not created before timeout");
}
@@ -692,7 +681,7 @@ public class VaultApiLiveTest extends BaseAzureComputeApiLiveTest {
@Test(dependsOnMethods = "testRecoverDeletedSecret")
public void testPurgeDeletedSecret() {
// delete the secret
- DeletedSecretBundle dsb = api().deleteSecret(vaultUri, RECOVERABLE_SECRET_NAME);
+ api().deleteSecret(vaultUri, RECOVERABLE_SECRET_NAME);
checkState(deletedSecretStatus.create(resourceGroupName, vaultUri, true).apply(RECOVERABLE_SECRET_NAME),
"secret was not deleted before timeout");
@@ -1041,7 +1030,7 @@ public class VaultApiLiveTest extends BaseAzureComputeApiLiveTest {
@Test(dependsOnMethods = "testRecoverDeletedCertificate")
public void testPurgeDeletedCertificate() {
// delete the certificate
- DeletedCertificateBundle dcb = api().deleteCertificate(vaultUri, RECOVERABLE_CERTIFICATE_NAME);
+ api().deleteCertificate(vaultUri, RECOVERABLE_CERTIFICATE_NAME);
checkState(deletedCertificateStatus.create(resourceGroupName, vaultUri, true).apply(RECOVERABLE_CERTIFICATE_NAME),
"certificate was not deleted before timeout");
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6a10544b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiMockTest.java
index 7459f48..be3ae74 100644
--- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiMockTest.java
+++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VaultApiMockTest.java
@@ -84,15 +84,12 @@ public class VaultApiMockTest extends BaseAzureComputeApiMockTest {
private URI vaultUri;
private static String KEY_NAME = "myKey";
- private static String TEMP_KEY_NAME = "myTempKey";
private static String IMPORT_KEY_NAME = "myImportKey";
private static String RECOVERABLE_KEY_NAME = "myRecoverableKey";
private static String SECRET_NAME = "mySecret";
private static String RECOVERABLE_SECRET_NAME = "myRecoverableSecret";
private static String CERTIFICATE_NAME = "myCertificate";
- private static String TEMP_CERTIFICATE_NAME = "myTempCertificate";
private static String RECOVERABLE_CERTIFICATE_NAME = "myRecoverableCertificate";
- private static String IMPORTABLE_CERTIFICATE_NAME = "myImportableCertificate";
private static String CERTIFICATE_ISSUER_NAME = "globalsign01";
private String IMPORTABLE_CERTIFICATE_PEM = stringFromResource("/vaultimportablecert.txt");
private String sampleSecret = stringFromResource("/vaultsamplesecret.txt");