Wildcard tag support for openapi tags config (#218)

Tinkoff · Jul 24, 2023 · cd6470e · cd6470e
1 parent e908f3b
commit cd6470e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/mkdocs/docs/features/openapi-codegen.md b/mkdocs/docs/features/openapi-codegen.md
@@ -73,9 +73,13 @@ Maven:
 <configOptions>
  <mode>java_client</mode>
  <tags>{
- "common": {
- "httpClientTag": "some.tag.CanonicalName.class",
- "telemetryTag": "some.tag.CanonicalName.class"
+ "*": { // применится для всех тегов, кроме явно указанных (в данном случае instrument)
+ "httpClientTag": "some.tag.Common.class",
+ "telemetryTag": "some.tag.Common.class"
+ }
+ "instrument": { // применится для instrument
+ "httpClientTag": "some.tag.Instrument.class",
+ "telemetryTag": "some.tag.Instrument.class"
  }
  }
  </tags>
@@ -86,11 +90,17 @@ Gradle:
  configOptions = [
  mode: "java_client",
  tags: """
- "common": {
- "httpClientTag": "some.tag.CanonicalName.class",
- "telemetryTag": "some.tag.CanonicalName.class"
+ {
+ "*": { // применится для всех тегов, кроме явно указанных (в данном случае instrument)
+ "httpClientTag": "some.tag.Common.class",
+ "telemetryTag": "some.tag.Common.class"
+ },
+ "instrument": { // применится для instrument
+ "httpClientTag": "some.tag.Instrument.class",
+ "telemetryTag": "some.tag.Instrument.class"
+ }
  }
- """
+  """
 ]
 ```
 

diff --git a/openapi/openapi-generator/src/main/java/ru/tinkoff/kora/openapi/generator/KoraCodegen.java b/openapi/openapi-generator/src/main/java/ru/tinkoff/kora/openapi/generator/KoraCodegen.java
@@ -1243,18 +1243,24 @@ record AuthMethodGroup(String name, List<CodegenSecurity> methods) {}
  }
  }
 
+ TagData tagData = null;
  for (var entry : this.tags.entrySet()) {
  if (op.tags.stream().anyMatch(t -> t.getName().equals(entry.getKey()))) {
- var tagData = entry.getValue();
- if (tagData.httpClientTag != null) {
- httpClientAnnotationParams.put("httpClientTag", tagData.httpClientTag);
- }
- if (tagData.telemetryTag != null) {
- httpClientAnnotationParams.put("telemetryTag", tagData.telemetryTag);
- }
+ tagData = entry.getValue();
  break;
  }
  }
+ if (tagData == null) {
+ tagData = this.tags.get("*");
+ }
+ if (tagData != null) {
+ if (tagData.httpClientTag != null) {
+ httpClientAnnotationParams.put("httpClientTag", tagData.httpClientTag);
+ }
+ if (tagData.telemetryTag != null) {
+ httpClientAnnotationParams.put("telemetryTag", tagData.telemetryTag);
+ }
+ }
 
  op.vendorExtensions.put("x-java-import", operationImports);
  var multipartForm = op.consumes != null && op.consumes.stream()