addressed PR comments

Author: daniel-sanche

kms/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.9</version>
+    <version>1.0.10</version>
   </parent>
 
   <properties>

kms/src/main/java/com/example/Asymmetric.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,27 +53,20 @@ public static CryptoKey createAsymmetricKey(String projectId, String locationId,
       String cryptoKeyId)
       throws IOException {
 
-    // Create the Cloud KMS client.
     try (KeyManagementServiceClient client = KeyManagementServiceClient.create()) {
-      // The resource name of the location associated with the KeyRing.
       String parent = KeyRingName.format(projectId, locationId, keyRingId);
 
-      // Choose a purpose (ASYMMETRIC_DECRYPT or ASYMMETRIC_SIGN).
       CryptoKeyPurpose purpose = CryptoKeyPurpose.ASYMMETRIC_DECRYPT;
-
-      // Choose an algorithm.
       CryptoKeyVersionAlgorithm algorithm = CryptoKeyVersionAlgorithm.RSA_DECRYPT_OAEP_2048_SHA256;
+
       CryptoKeyVersionTemplate version = CryptoKeyVersionTemplate.newBuilder()
           .setAlgorithm(algorithm)
           .build();
-
-      // Build the key template
       CryptoKey cryptoKey = CryptoKey.newBuilder()
           .setPurpose(purpose)
           .setVersionTemplate(version)
           .build();
 
-      // Create the CryptoKey for your project.
       CryptoKey createdKey = client.createCryptoKey(parent, cryptoKeyId, cryptoKey);
 
       return createdKey;
@@ -156,7 +149,9 @@ public static byte[] encryptRSA(String keyName, byte[] plaintext)
       X509EncodedKeySpec keySpec = new X509EncodedKeySpec(derKey);
       PublicKey rsaKey = KeyFactory.getInstance("RSA").generatePublic(keySpec);
 
-      // Encrypt the plaintext
+      // Encrypt plaintext for the 'RSA_DECRYPT_OAEP_2048_SHA256' key.
+      // For other key algorithms:
+      // https://docs.oracle.com/javase/7/docs/api/javax/crypto/Cipher.html
       Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
       OAEPParameterSpec oaepParams = new OAEPParameterSpec(
           "SHA-256", "MGF1", MGF1ParameterSpec.SHA256, PSource.PSpecified.DEFAULT);
@@ -217,7 +212,9 @@ public static boolean verifySignatureRSA(String keyName, byte[] message, byte[]
       X509EncodedKeySpec keySpec = new X509EncodedKeySpec(derKey);
       PublicKey rsaKey = KeyFactory.getInstance("RSA").generatePublic(keySpec);
 
-      // Verify the signature
+      // Verify the 'RSA_SIGN_PKCS1_2048_SHA256' signature.
+      // For other key algorithms:
+      // http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#Signature
       Signature rsaVerify = Signature.getInstance("SHA256withRSA");
       rsaVerify.initVerify(rsaKey);
       rsaVerify.update(message);
@@ -249,7 +246,9 @@ public static boolean verifySignatureEC(String keyName, byte[] message, byte[] s
       X509EncodedKeySpec keySpec = new X509EncodedKeySpec(derKey);
       PublicKey ecKey = KeyFactory.getInstance("EC").generatePublic(keySpec);
 
-      // Verify the signature
+      // Verify the 'EC_SIGN_P256_SHA256' signature
+      // For other key algorithms:
+      // http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#Signature
       Signature ecVerify = Signature.getInstance("SHA256withECDSA");
       ecVerify.initVerify(ecKey);
       ecVerify.update(message);

kms/src/main/java/com/example/CryptFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public static byte[] encrypt(
       throws IOException {
 
     // Create the KeyManagementServiceClient using try-with-resources to manage client cleanup.
-    try (KeyManagementServiceClient client = Snippets.createClient()) {
+    try (KeyManagementServiceClient client = KeyManagementServiceClient.create()) {
 
       // The resource name of the cryptoKey
       String resourceName = CryptoKeyName.format(projectId, locationId, keyRingId, cryptoKeyId);
@@ -62,7 +62,7 @@ public static byte[] decrypt(
       throws IOException {
 
     // Create the KeyManagementServiceClient using try-with-resources to manage client cleanup.
-    try (KeyManagementServiceClient client = Snippets.createClient()) {
+    try (KeyManagementServiceClient client = KeyManagementServiceClient.create()) {
 
       // The resource name of the cryptoKey
       String resourceName = CryptoKeyName.format(projectId, locationId, keyRingId, cryptoKeyId);

kms/src/main/java/com/example/CryptFileCommands.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

kms/src/main/java/com/example/Quickstart.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,8 +38,6 @@ public static void main(String... args) throws Exception {
     String location = args[1];
 
     // Create the KeyManagementServiceClient using try-with-resources to manage client cleanup.
-    // GAP: missing ability to set application name
-    // see https://github.com/googleapis/gax-java/issues/614
     try (KeyManagementServiceClient client = KeyManagementServiceClient.create()) {
 
       // The resource name of the location to search

kms/src/main/java/com/example/SnippetCommands.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

kms/src/main/java/com/example/Snippets.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,18 +43,6 @@
 
 public class Snippets {
 
-  /**
-   * Creates a KeyManagementServiceClient using Application Default Credentials.
-   *
-   * @return an authorized KeyManagementServiceClient.
-   * @throws IOException if there's an error getting the default credentials.
-   */
-  public static KeyManagementServiceClient createClient() throws IOException {
-    // GAP: missing ability to set application name
-    // see https://github.com/googleapis/gax-java/issues/614
-    return KeyManagementServiceClient.create();
-  }
-
   // [START kms_create_keyring]
 
   /**
@@ -411,16 +399,16 @@ public static Policy removeMemberFromCryptoKeyPolicy(
 
       // Create a bindings list that filters out the provided member
       List<Binding> newBindings = new ArrayList<>();
-      for (Binding b : iamPolicy.getBindingsList()) {
-        if (!b.getRole().equals(role)) {
-          newBindings.add(b);
+      for (Binding binding : iamPolicy.getBindingsList()) {
+        if (!binding.getRole().equals(role)) {
+          newBindings.add(binding);
           continue;
         }
 
-        Binding.Builder builder = Binding.newBuilder().setRole(b.getRole());
-        for (String m : b.getMembersList()) {
-          if (!member.equals(m)) {
-            builder.addMembers(m);
+        Binding.Builder builder = Binding.newBuilder().setRole(binding.getRole());
+        for (String bindingMember : binding.getMembersList()) {
+          if (!member.equals(bindingMember)) {
+            builder.addMembers(bindingMember);
           }
         }
         newBindings.add(builder.build());
@@ -458,14 +446,14 @@ public static Policy removeMemberFromKeyRingPolicy(
 
       // Create a bindings list that filters out the provided member
       List<Binding> newBindings = new ArrayList<>();
-      for (Binding b : iamPolicy.getBindingsList()) {
-        if (!b.getRole().equals(role)) {
-          newBindings.add(b);
+      for (Binding binding : iamPolicy.getBindingsList()) {
+        if (!binding.getRole().equals(role)) {
+          newBindings.add(binding);
         } else {
-          Binding.Builder builder = Binding.newBuilder().setRole(b.getRole());
-          for (String m : b.getMembersList()) {
-            if (!member.equals(m)) {
-              builder.addMembers(m);
+          Binding.Builder builder = Binding.newBuilder().setRole(binding.getRole());
+          for (String bindingMember : binding.getMembersList()) {
+            if (!member.equals(bindingMember)) {
+              builder.addMembers(bindingMember);
             }
           }
           newBindings.add(builder.build());

kms/src/test/java/com/example/AsymmetricIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ private static boolean createKeyHelper(
 
   @BeforeClass
   public static void setUpClass() throws Exception {
-    // TODO: set application name
+    // TODO: set application name. https://github.com/googleapis/gax-java/issues/614
     client = KeyManagementServiceClient.create();
 
     try {

kms/src/test/java/com/example/CryptFileIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,11 +67,11 @@ public static void tearDownClass() throws Exception {
     List<CryptoKeyVersion> versions = 
         Snippets.listCryptoKeyVersions(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
 
-    for (CryptoKeyVersion v : versions) {
-      if (!v.getState().equals(CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED)) {
+    for (CryptoKeyVersion version : versions) {
+      if (!version.getState().equals(CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED)) {
         Snippets.destroyCryptoKeyVersion(
             PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID,
-            SnippetsIT.parseVersionId(v.getName()));
+            SnippetsIT.parseVersionId(version.getName()));
       }
     }
   }

kms/src/test/java/com/example/QuickstartIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

kms/src/test/java/com/example/SnippetsIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,10 +73,10 @@ public static void tearDownClass() throws Exception {
     List<CryptoKeyVersion> versions = 
         Snippets.listCryptoKeyVersions(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
 
-    for (CryptoKeyVersion v : versions) {
-      if (!v.getState().equals(CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED)) {
+    for (CryptoKeyVersion version : versions) {
+      if (!version.getState().equals(CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED)) {
         Snippets.destroyCryptoKeyVersion(
-            PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, parseVersionId(v.getName()));
+            PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID, parseVersionId(version.getName()));
       }
     }
   }
@@ -101,11 +101,11 @@ public void listCryptoKeyVersions_retrievesVersions() throws Exception {
     List<CryptoKeyVersion> versions = 
         Snippets.listCryptoKeyVersions(PROJECT_ID, LOCATION_ID, KEY_RING_ID, CRYPTO_KEY_ID);
 
-    for (CryptoKeyVersion v : versions) {
-      assertThat(v.getName()).contains(String.format(
+    for (CryptoKeyVersion version : versions) {
+      assertThat(version.getName()).contains(String.format(
           "keyRings/%s/cryptoKeys/%s/cryptoKeyVersions/", KEY_RING_ID, CRYPTO_KEY_ID));
 
-      if (v.getState().equals(CryptoKeyVersion.CryptoKeyVersionState.ENABLED)) {
+      if (version.getState().equals(CryptoKeyVersion.CryptoKeyVersionState.ENABLED)) {
         return;
       }
     }