Merge branch 'ci/optimize-fmt' of github.com:googleapis/google-cloud-java into ci/optimize-fmt

Author: lqiu96

.kokoro/build.sh

@@ -231,16 +231,21 @@ case ${JOB_TYPE} in
                     dir=$(dirname "${dir}")
                 done
                 if [ -f "${dir}/pom.xml" ] && [ "${dir}" != "." ]; then
-                    # Exclude sample modules as they are not in the default reactor
-                    if [[ "${dir}" != *"samples"* ]]; then
-                        echo "Processed file: ${changed_file} -> resolved module: ${dir}"
+                    # Filter out samples, directories with no Java source code, and generated protobuf/gRPC code
+                    if [[ "${dir}" != *"samples"* ]] && \
+                       [[ "$(basename "${dir}")" != "proto-google-"* ]] && \
+                       [[ "$(basename "${dir}")" != "grpc-google-"* ]] && \
+                       [[ "$(basename "${dir}")" != *"-bom" ]] && \
+                       [[ "$(basename "${dir}")" != "google-cloud-pom-parent" ]] && \
+                       [[ "$(basename "${dir}")" != "google-cloud-jar-parent" ]]; then
+                       
                         changed_modules+=("${dir}")
                     fi
                 fi
             fi
         done <<< "${changed_file_list}"
 
-        echo "Changed Modules: ${changed_modules}"
+        echo "Changed Modules: ${changed_modules[*]}"
 
         # Deduplicate the modules using sort -u, so that we pass a concise list of unique modules
         # via the Maven `-pl` argument.
@@ -250,32 +255,8 @@ case ${JOB_TYPE} in
             echo "Formatting only changed modules: ${unique_modules}"
         fi
     else
-        echo "BASE_SHA or HEAD_SHA is empty. Skipping file difference check."
-
-        # Build a list of exclusions to skip formatting generated code.
-        exclusions=""
-        
-        # Find and exclude generated sub-modules and parent/aggregator POMs:
-        # - proto-google-*, grpc-google-* : Generated protobuf/gRPC code should not be formatted manually.
-        # - *-bom : Bill of Materials modules that contain no valid source code anyway.
-        # - java-* at depth 1 : Top-level aggregator parent POMs for each library module wrapper.
-        # - google-cloud-pom-parent, google-cloud-jar-parent, gapic-libraries-bom : Repo-level parent modules.
-        # The syntax for excluding in Maven requires a "!" prefix before the path in the `-pl` argument.
-        for dir in $(find . -maxdepth 1 -type d -name "java-*" | sort; \
-                      find . -maxdepth 2 -type d \( -name "proto-google-*" -o -name "grpc-google-*" -o -name "*-bom" -o -name "google-cloud-pom-parent" -o -name "google-cloud-jar-parent" \) | sort); do
-            # Strip leading ./
-            dir="${dir#./}"
-            if [ -n "${exclusions}" ]; then
-                exclusions="${exclusions},!${dir}"
-            else
-                exclusions="!${dir}"
-            fi
-        done
-
-        if [ -n "${exclusions}" ]; then
-            MODULE_FILTER="-pl ${exclusions}"
-            echo "Excluding generated modules from formatting"
-        fi
+        echo "BASE_SHA or HEAD_SHA is empty. Cannot continue linting."
+        exit 1
     fi
 
     mvn -B -ntp \

java-accessapproval/google-cloud-accessapproval/src/test/java/com/google/cloud/accessapproval/v1/MockAccessApprovalImpl.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -261,3 +259,5 @@ public void getAccessApprovalServiceAccount(
     }
   }
 }
+// .
+// .

java-accessapproval/grpc-google-cloud-accessapproval-v1/src/main/java/com/google/cloud/accessapproval/v1/AccessApprovalGrpc.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1839,3 +1837,5 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
     return result;
   }
 }
+// .
+// .

java-accessapproval/proto-google-cloud-accessapproval-v1/src/main/java/com/google/cloud/accessapproval/v1/DeleteAccessApprovalSettingsMessageOrBuilder.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,3 +51,5 @@ public interface DeleteAccessApprovalSettingsMessageOrBuilder
    */
   com.google.protobuf.ByteString getNameBytes();
 }
+// .
+// .

java-accesscontextmanager/google-identity-accesscontextmanager/src/test/java/com/google/identity/accesscontextmanager/v1/AccessContextManagerClientTest.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -2070,3 +2068,5 @@ public void testIamPermissionsExceptionTest() throws Exception {
     }
   }
 }
+// .
+// .

java-accesscontextmanager/grpc-google-identity-accesscontextmanager-v1/src/main/java/com/google/identity/accesscontextmanager/v1/AccessContextManagerGrpc.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -4571,3 +4569,5 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
     return result;
   }
 }
+// .
+// .

java-accesscontextmanager/proto-google-identity-accesscontextmanager-type/src/main/java/com/google/identity/accesscontextmanager/type/DeviceEncryptionStatus.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -218,3 +216,5 @@ private DeviceEncryptionStatus(int value) {
 
   // @@protoc_insertion_point(enum_scope:google.identity.accesscontextmanager.type.DeviceEncryptionStatus)
 }
+// .
+// .

java-accesscontextmanager/proto-google-identity-accesscontextmanager-v1/src/main/java/com/google/identity/accesscontextmanager/v1/GetAccessLevelRequest.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -860,3 +858,5 @@ public com.google.protobuf.Parser<GetAccessLevelRequest> getParserForType() {
     return DEFAULT_INSTANCE;
   }
 }
+// .
+// .

java-admanager/ad-manager/src/test/java/com/google/ads/admanager/v1/CustomFieldServiceClientTest.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -806,3 +804,5 @@ public void batchDeactivateCustomFieldsExceptionTest2() throws Exception {
     }
   }
 }
+// .
+// .

java-admanager/proto-ad-manager-v1/src/main/java/com/google/ads/admanager/v1/MobileDeviceSubmodelName.java

@@ -1,5 +1,3 @@
-//.
-/*
  * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -200,3 +198,5 @@ public MobileDeviceSubmodelName build() {
     }
   }
 }
+// .
+// .