From fccb76b3436910ab5d8710419b03efd2b10f7196 Mon Sep 17 00:00:00 2001 From: Phil Del Vecchio Date: Mon, 27 Apr 2026 12:46:36 -0400 Subject: [PATCH] Fix consecutive-acronym handling for tags like 'Bits AI SRE' --- .generator/conftest.py | 4 ++-- .generator/src/generator/templates/example.j2 | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.generator/conftest.py b/.generator/conftest.py index 98a89ec1223..8cdc47160ed 100644 --- a/.generator/conftest.py +++ b/.generator/conftest.py @@ -295,9 +295,9 @@ def operation_specs(specs): @given(parsers.parse('an instance of "{name}" API')) def api(context, api_version, specs, name): """Return an API instance.""" - assert name in {tag["name"].replace(" ", "") for tag in specs[api_version]["tags"]} + raw_tag = next(t["name"] for t in specs[api_version]["tags"] if t["name"].replace(" ", "") == name) api_name = name.replace("-", "") - context["api_instance"] = {"name": api_name} + context["api_instance"] = {"name": api_name, "raw_tag": raw_tag} @given(parsers.parse('operation "{name}" enabled')) diff --git a/.generator/src/generator/templates/example.j2 b/.generator/src/generator/templates/example.j2 index 60d4e9aa825..72a2d2a411c 100644 --- a/.generator/src/generator/templates/example.j2 +++ b/.generator/src/generator/templates/example.j2 @@ -14,9 +14,9 @@ import {{ package }}.{{ import }}; import com.datadog.api.client.ApiException; import com.datadog.api.client.ApiClient; -import com.datadog.api.client.{{ version }}.api.{{ context.api_instance.name|camel_case|upperfirst }}Api; +import com.datadog.api.client.{{ version }}.api.{{ context.api_instance.raw_tag|camel_case|upperfirst }}Api; {%- if optional_parameters %} -import com.datadog.api.client.{{ version }}.api.{{ context.api_instance.name|camel_case|upperfirst }}Api.{{ context.api_request.operation_id }}OptionalParameters; +import com.datadog.api.client.{{ version }}.api.{{ context.api_instance.raw_tag|camel_case|upperfirst }}Api.{{ context.api_request.operation_id }}OptionalParameters; {%- endif %} {%- if api_reponse_type_import %} import {{ api_reponse_type_import}}; @@ -44,7 +44,7 @@ public class Example { {%- for operation in context._enable_operations|sort %} defaultClient.setUnstableOperationEnabled("{{ version }}.{{ operation|untitle_case }}", true); {%- endfor %} - {{ context.api_instance.name|camel_case|upperfirst }}Api apiInstance = new {{ context.api_instance.name|camel_case|upperfirst }}Api(defaultClient); + {{ context.api_instance.raw_tag|camel_case|upperfirst }}Api apiInstance = new {{ context.api_instance.raw_tag|camel_case|upperfirst }}Api(defaultClient); {%- for name, values in context._given.items() %} @@ -86,7 +86,7 @@ public class Example { System.out.println(item); } } catch (RuntimeException e) { - System.err.println("Exception when calling {{ context.api_instance.name|camel_case|upperfirst }}Api#{{ context.api_request.operation_id|untitle_case }}WithPagination"); + System.err.println("Exception when calling {{ context.api_instance.raw_tag|camel_case|upperfirst }}Api#{{ context.api_request.operation_id|untitle_case }}WithPagination"); System.err.println("Reason: " + e.getMessage()); e.printStackTrace(); } @@ -98,7 +98,7 @@ public class Example { System.out.println(result); {%- endif %} } catch (ApiException e) { - System.err.println("Exception when calling {{ context.api_instance.name|camel_case|upperfirst }}Api#{{ context.api_request.operation_id|untitle_case }}"); + System.err.println("Exception when calling {{ context.api_instance.raw_tag|camel_case|upperfirst }}Api#{{ context.api_request.operation_id|untitle_case }}"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders());