Applied suggestions from code review

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: dhavalbhensdadiya-crest

secretmanager/src/main/java/secretmanager/CreateSecretWithCmek.java

@@ -16,7 +16,7 @@
 
 package secretmanager;
 
-// [START secretmanager_create_secret_with_annotations]
+// [START secretmanager_create_secret_with_cmek]
 import com.google.cloud.secretmanager.v1.CustomerManagedEncryption;
 import com.google.cloud.secretmanager.v1.ProjectName;
 import com.google.cloud.secretmanager.v1.Replication;
@@ -38,7 +38,7 @@ public static void main() throws IOException {
     createSecretWithCmek(projectId, secretId, kmsKeyName);
   }
 
-  // Create a secret with annotations.
+  // Create a secret with a customer-managed encryption key (CMEK).
   public static Secret createSecretWithCmek(String projectId, String secretId, String kmsKeyName)
       throws IOException {
 
@@ -63,7 +63,7 @@ public static Secret createSecretWithCmek(String projectId, String secretId, Str
                       .build())
               .build();
 
-      // Build the secret to create with labels.
+      // Build the secret to create with the replication policy.
       Secret secret = Secret.newBuilder().setReplication(secretReplication).build();
 
       // Create the secret.
@@ -73,4 +73,4 @@ public static Secret createSecretWithCmek(String projectId, String secretId, Str
     }
   }
 }
-// [END secretmanager_create_secret_with_annotations]
+// [END secretmanager_create_secret_with_cmek]

secretmanager/src/main/java/secretmanager/DeleteSecretAnnotations.java

@@ -48,19 +48,11 @@ public static Secret deleteSecretAnnotations(String projectId, String secretId)
       // Build the name of the secret.
       SecretName secretName = SecretName.of(projectId, secretId);
 
-      // Get the current secret
-      Secret existingSecret = client.getSecret(secretName);
-
-      // Remove all annotations
-      Map<String, String> existingAnnotationsMap =
-          new HashMap<String, String>(existingSecret.getAnnotationsMap());
-      existingAnnotationsMap.clear();
-
-      // Build the updated secret.
+      // Build the updated secret with an empty annotations map.
       Secret secret =
           Secret.newBuilder()
               .setName(secretName.toString())
-              .putAllAnnotations(existingAnnotationsMap)
+              .putAllAnnotations(new HashMap<>())
               .build();
 
       // Create the field mask for updating only the annotations

secretmanager/src/main/java/secretmanager/regionalsamples/DeleteRegionalSecretAnnotations.java

@@ -59,19 +59,11 @@ public static Secret deleteRegionalSecretAnnotations(
       SecretName secretName =
           SecretName.ofProjectLocationSecretName(projectId, locationId, secretId);
 
-      // Get the current secret
-      Secret existingSecret = client.getSecret(secretName);
-
-      // Remove all annotations
-      Map<String, String> existingAnnotationsMap =
-          new HashMap<String, String>(existingSecret.getAnnotationsMap());
-      existingAnnotationsMap.clear();
-
-      // Build the updated secret.
+      // Build the updated secret with an empty annotations map.
       Secret secret =
           Secret.newBuilder()
               .setName(secretName.toString())
-              .putAllAnnotations(existingAnnotationsMap)
+              .putAllAnnotations(new HashMap<>())
               .build();
 
       // Create the field mask for updating only the annotations