Skip to content

Fix consecutive-acronym handling in generated examples #3766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pdv wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

Fix consecutive-acronym handling in generated examples #3766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .generator/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
10 changes: 5 additions & 5 deletions .generator/src/generator/templates/example.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}};
Expand Down Expand Up @@ -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() %}

Expand Down Expand Up @@ -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();
}
Expand All @@ -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());
Expand Down
Loading