From 8bdaa04ebcfc88567c9f1d131d71fef36b2f279a Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 22 Apr 2026 10:37:49 -0400 Subject: [PATCH 1/2] fix(generator): special-case string type in fallback logic --- generator/src/googleapis/codegen/java_generator.py | 11 +++++------ generator/tests/java_generator_test.py | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/generator/src/googleapis/codegen/java_generator.py b/generator/src/googleapis/codegen/java_generator.py index 609f1782a20..5f0fd946569 100755 --- a/generator/src/googleapis/codegen/java_generator.py +++ b/generator/src/googleapis/codegen/java_generator.py @@ -261,12 +261,11 @@ def _GetTypeInfo(self, def_dict): if result: return result - # TODO(user): Uncomment this and update golden files. - # result = self.type_map.get((json_type, None)) - # if result: - # return result - # - # raise ValueError('Unknown type: %s format: %s' % (json_type, json_format)) + # Fallback to the unformatted base type if exact format mapping is not found. + result = self.type_map.get((json_type, None)) + if result and json_type != 'string': + return result + return (utilities.CamelCase(json_type), None, None) diff --git a/generator/tests/java_generator_test.py b/generator/tests/java_generator_test.py index 99cd443690f..0b54f69a03f 100755 --- a/generator/tests/java_generator_test.py +++ b/generator/tests/java_generator_test.py @@ -88,6 +88,9 @@ def testGetCodeTypeFromDictionary(self): ['java.lang.String', {'type': 'string'}], ['java.lang.Long', {'type': 'integer', 'format': 'uint32'}], ['java.math.BigInteger', {'type': 'string', 'format': 'uint64'}], + ['java.lang.Object', {'type': 'any', 'format': 'unknown'}], + ['String', {'type': 'string', 'format': 'unknown'}], + ] for test_case in test_cases: self.assertEqual( @@ -110,6 +113,9 @@ def testGetPrimitiveTypeFromDictionary(self): [None, {'type': 'string', 'format': 'date-time'}], [None, {'type': 'string', 'format': 'uint64'}], [None, {'type': 'anything_else', 'format': 'uint64'}], + [None, {'type': 'any', 'format': 'unknown'}], + [None, {'type': 'string', 'format': 'unknown'}], + ] for test_case in test_cases: From a346f5658617d54028d67dea6528c44ae26c17fd Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 22 Apr 2026 10:40:08 -0400 Subject: [PATCH 2/2] feat(generator): regenerate compute and cloudbuild with exact revisions --- .../2.0.0/com/google/api/services/compute/Compute.java | 5 ++--- .../api/services/compute/model/StructuredEntries.java | 6 +++--- .../beta/2.0.0/com/google/api/services/compute/Compute.java | 5 ++--- .../api/services/compute/model/StructuredEntries.java | 6 +++--- .../v1/2.0.0/com/google/api/services/compute/Compute.java | 5 ++--- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java b/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java index 9f7414d43f7..2194b81e785 100644 --- a/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java +++ b/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java @@ -103,7 +103,7 @@ public class Compute extends com.google.api.client.googleapis.services.json.Abst * {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport} *
  • Android: {@code newCompatibleTransport} from * {@code com.google.api.client.extensions.android.http.AndroidHttp}
    • - *
  • Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()} + *
  • Java: {@code com.google.api.client.http.javanet.NetHttpTransport}
    • * * * @param jsonFactory JSON factory, which may be: @@ -293216,8 +293216,7 @@ private static String chooseEndpoint(com.google.api.client.http.HttpTransport tr * {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport} *
  • Android: {@code newCompatibleTransport} from * {@code com.google.api.client.extensions.android.http.AndroidHttp}
    • - *
  • Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()} - *
    • + *
  • Java: {@code com.google.api.client.http.javanet.NetHttpTransport}
    • * * @param jsonFactory JSON factory, which may be: * * @param jsonFactory JSON factory, which may be: @@ -270048,8 +270048,7 @@ private static String chooseEndpoint(com.google.api.client.http.HttpTransport tr * {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport} *
  • Android: {@code newCompatibleTransport} from * {@code com.google.api.client.extensions.android.http.AndroidHttp}
    • - *
  • Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()} - *
    • + *
  • Java: {@code com.google.api.client.http.javanet.NetHttpTransport}
    • * * @param jsonFactory JSON factory, which may be: * * @param jsonFactory JSON factory, which may be: @@ -234047,8 +234047,7 @@ private static String chooseEndpoint(com.google.api.client.http.HttpTransport tr * {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport} *
  • Android: {@code newCompatibleTransport} from * {@code com.google.api.client.extensions.android.http.AndroidHttp}
    • - *
  • Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()} - *
    • + *
  • Java: {@code com.google.api.client.http.javanet.NetHttpTransport}
    • * * @param jsonFactory JSON factory, which may be: *