Skip to content

Commit

Permalink
Regenerate kms client
Browse files Browse the repository at this point in the history
  • Loading branch information
yoshi-automation committed Nov 21, 2018
1 parent eb9fae5 commit 4492078
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,9 @@ public String extractNextToken(ListKeyRingsResponse payload) {

@Override
public Iterable<KeyRing> extractResources(ListKeyRingsResponse payload) {
return payload.getKeyRingsList();
return payload.getKeyRingsList() != null
? payload.getKeyRingsList()
: ImmutableList.<KeyRing>of();
}
};

Expand Down Expand Up @@ -440,7 +442,9 @@ public String extractNextToken(ListCryptoKeysResponse payload) {

@Override
public Iterable<CryptoKey> extractResources(ListCryptoKeysResponse payload) {
return payload.getCryptoKeysList();
return payload.getCryptoKeysList() != null
? payload.getCryptoKeysList()
: ImmutableList.<CryptoKey>of();
}
};

Expand Down Expand Up @@ -479,7 +483,9 @@ public String extractNextToken(ListCryptoKeyVersionsResponse payload) {
@Override
public Iterable<CryptoKeyVersion> extractResources(
ListCryptoKeyVersionsResponse payload) {
return payload.getCryptoKeyVersionsList();
return payload.getCryptoKeyVersionsList() != null
? payload.getCryptoKeyVersionsList()
: ImmutableList.<CryptoKeyVersion>of();
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.google.api.gax.grpc.testing.MockServiceHelper;
import com.google.api.gax.rpc.ApiClientHeaderProvider;
import com.google.api.gax.rpc.InvalidArgumentException;
import com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose;
import com.google.common.collect.Lists;
import com.google.iam.v1.GetIamPolicyRequest;
import com.google.iam.v1.Policy;
Expand Down

0 comments on commit 4492078

Please sign in to comment.