chore: Address review comments.

Author: blakeli0

.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml

@@ -91,8 +91,6 @@ steps:
   ]
   env:
   - "DOCKER_BUILDKIT=1"
-# This does not work until gapic-generator-java is updated to the next released version.
-  - "TEST_CURRENT_YEAR=2025"
   id: generate-libraries
   waitFor: [
     "build-image",

gapic-generator-java/pom.xml

@@ -17,6 +17,7 @@
     <googleapis.commit>9fcfbea0aa5b50fa22e190faceb073d74504172b</googleapis.commit>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <currentYearOverride>2025</currentYearOverride>
   </properties>
 
   <parent>
@@ -323,8 +324,9 @@
               target/generated-test-resources/protobuf/descriptor-sets
             </additionalClasspathElement>
           </additionalClasspathElements>
+          <!-- Set CURRENT_YEAR_OVERRIDE to a fixed year so the unit test result is consistent -->
           <environmentVariables>
-            <TEST_CURRENT_YEAR>2025</TEST_CURRENT_YEAR>
+            <CURRENT_YEAR_OVERRIDE>${currentYearOverride}</CURRENT_YEAR_OVERRIDE>
           </environmentVariables>
         </configuration>
       </plugin>

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/CommentComposer.java

@@ -81,7 +81,7 @@ public class CommentComposer {
                   "https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library")));
 
   private static String getCurrentYear() {
-    String testCurrentYear = System.getenv("TEST_CURRENT_YEAR");
+    String testCurrentYear = System.getenv("CURRENT_YEAR_OVERRIDE");
     int currentYearFromCalendar = Calendar.getInstance().get(Calendar.YEAR);
     return Strings.isNullOrEmpty(testCurrentYear)
         ? String.valueOf(currentYearFromCalendar)

hermetic_build/library_generation/owlbot/synthtool/languages/java.py

@@ -55,7 +55,7 @@
 
 
 def _get_good_license():
-    current_year = int(os.getenv("TEST_CURRENT_YEAR", date.today().year))
+    current_year = int(os.getenv("CURRENT_YEAR_OVERRIDE", date.today().year))
     good_license = f"""/*
  * Copyright {current_year} Google LLC
  *

hermetic_build/library_generation/tests/owlbot/java_unit_tests.py

@@ -27,7 +27,7 @@
 TEST_OWLBOT = Path(__file__).parent.parent / "resources" / "test-owlbot"
 FIXTURES = Path(__file__).parent.parent / "resources" / "test-owlbot" / "fixtures"
 TEMPLATES_PATH = Path(__file__).parent.parent.parent / "owlbot" / "templates"
-TEST_CURRENT_YEAR = "2025"
+CURRENT_YEAR_OVERRIDE = "2025"
 
 SAMPLE_METADATA = """
 <metadata>
@@ -173,7 +173,7 @@ def test_deprecate_method(self):
             )
             os.chdir(cwd)
 
-    @mock.patch.dict(os.environ, {"TEST_CURRENT_YEAR": TEST_CURRENT_YEAR})
+    @mock.patch.dict(os.environ, {"CURRENT_YEAR_OVERRIDE": CURRENT_YEAR_OVERRIDE})
     def test_fix_proto_license(self):
         with tempfile.TemporaryDirectory() as tempdir:
             cwd = os.getcwd()
@@ -190,7 +190,7 @@ def test_fix_proto_license(self):
             )
             os.chdir(cwd)
 
-    @mock.patch.dict(os.environ, {"TEST_CURRENT_YEAR": TEST_CURRENT_YEAR})
+    @mock.patch.dict(os.environ, {"CURRENT_YEAR_OVERRIDE": CURRENT_YEAR_OVERRIDE})
     def test_fix_proto_license_idempotent(self):
         with tempfile.TemporaryDirectory() as tempdir:
             cwd = os.getcwd()
@@ -209,7 +209,7 @@ def test_fix_proto_license_idempotent(self):
             )
             os.chdir(cwd)
 
-    @mock.patch.dict(os.environ, {"TEST_CURRENT_YEAR": TEST_CURRENT_YEAR})
+    @mock.patch.dict(os.environ, {"CURRENT_YEAR_OVERRIDE": CURRENT_YEAR_OVERRIDE})
     def test_fix_grpc_license(self):
         with tempfile.TemporaryDirectory() as tempdir:
             cwd = os.getcwd()
@@ -226,7 +226,7 @@ def test_fix_grpc_license(self):
             )
             os.chdir(cwd)
 
-    @mock.patch.dict(os.environ, {"TEST_CURRENT_YEAR": TEST_CURRENT_YEAR})
+    @mock.patch.dict(os.environ, {"CURRENT_YEAR_OVERRIDE": CURRENT_YEAR_OVERRIDE})
     def test_fix_grpc_license_idempotent(self):
         with tempfile.TemporaryDirectory() as tempdir:
             cwd = os.getcwd()