From 769543e6585d5368f90cc781bb89ec1ac0ac7673 Mon Sep 17 00:00:00 2001 From: myznikov Date: Fri, 14 Feb 2025 12:48:00 +0300 Subject: [PATCH] fixed api and controller template. added package to config --- Templates/v2/Java/api.stencil | 3 +++ Templates/v2/Java/config/java.config.yaml | 2 ++ Templates/v2/Java/controller.stencil | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Templates/v2/Java/api.stencil b/Templates/v2/Java/api.stencil index d07c55d..7682ad3 100644 --- a/Templates/v2/Java/api.stencil +++ b/Templates/v2/Java/api.stencil @@ -18,6 +18,9 @@ public interface {{ service.name }}Api { @ResponseStatus(HttpStatus.NO_CONTENT) {%- endif %} @{{ operation.httpMethod|capitalizeFirstLetter }}Mapping("{{ path.path }}") +{%- if operation.responseGenerationModel.key != "204" %} + @NotNull +{%- endif %} {%- if operation.httpMethod|lowercase == "delete" %} void{% else %} ResponseEntity<{{ operation.responseGenerationModel.value.typeNames|join }}> diff --git a/Templates/v2/Java/config/java.config.yaml b/Templates/v2/Java/config/java.config.yaml index 78afcb1..7a4d0d8 100644 --- a/Templates/v2/Java/config/java.config.yaml +++ b/Templates/v2/Java/config/java.config.yaml @@ -3,6 +3,8 @@ useNewNullableDeterminationStrategy: false prefixesToCutDownInServiceNames: - /api/v1.1 - /api/1.1 +environment: + package: analytcsConfig: logstashEnpointURI: http://logs.ps.surfstudio.ru diff --git a/Templates/v2/Java/controller.stencil b/Templates/v2/Java/controller.stencil index aeda6b9..6b98ddf 100644 --- a/Templates/v2/Java/controller.stencil +++ b/Templates/v2/Java/controller.stencil @@ -18,9 +18,6 @@ public class {{ service.name }}Controller implements {{ service.name }}Api { {%- for operation in path.operations%} @Override - {%- if operation.responseGenerationModel.key != "204" %} - @NotNull - {%- endif %} public {% if operation.responseGenerationModel.key == "204" %}void{% else %}ResponseEntity<{{ operation.responseGenerationModel.value.typeNames|join }}>{% endif %} {{ operation.id }}( {%- for parameter in operation.pathParameters %}final {{ parameter.typeModel.name|capitalizeFirstLetter }} {{ parameter.name|snakeCaseToCamelCase }} {%- if not forloop.last or operation.headerParameters or operation.queryParameters or operation.requestGenerationModel.typeNames%}, {% endif -%}{% endfor -%}