loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-30 13:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

scala cask fix for missing annotations on simple routes (#18371)

Browse Source
This commit is contained in:
Aaron Pritzlaff 2024-04-12 17:46:51 +01:00 committed by GitHub
parent 86186586c7
commit 85c81e84d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaCaskServerCodegen.java
View File

@ -18,7 +18,6 @@ package org.openapitools.codegen.languages;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.tags.Tag;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.ModelMap;
@ -32,7 +31,6 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.regex.PatternSyntaxException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -152,6 +150,7 @@ public class ScalaCaskServerCodegen extends AbstractScalaCodegen implements Code
return defaultValue; return defaultValue;
} }
} }
@Override @Override
public void processOpts() { public void processOpts() {
super.processOpts(); super.processOpts();
@ -521,13 +520,14 @@ public class ScalaCaskServerCodegen extends AbstractScalaCodegen implements Code
List<ScalaCaskServerCodegen.OperationGroup> groups = group(operationList); List<ScalaCaskServerCodegen.OperationGroup> groups = group(operationList);
operationList.forEach((op) -> { operationList.forEach((op) -> {
for (final ScalaCaskServerCodegen.OperationGroup group : groups) { // for the usage/call site
// for the usage/call site final String scalaPath = pathWithBracketPlaceholdersRemovedAndXPathIndexAdded(op);
final String scalaPath = pathWithBracketPlaceholdersRemovedAndXPathIndexAdded(op); op.vendorExtensions.put("x-cask-path", scalaPath);
op.vendorExtensions.put("x-cask-path", scalaPath);
final String annotation = "@cask." + op.httpMethod.toLowerCase(Locale.ROOT); final String annotation = "@cask." + op.httpMethod.toLowerCase(Locale.ROOT);
op.vendorExtensions.put("x-annotation", annotation); op.vendorExtensions.put("x-annotation", annotation);
for (final ScalaCaskServerCodegen.OperationGroup group : groups) {
if (!group.contains(op)) { if (!group.contains(op)) {
if (op.path.startsWith(group.pathPrefix) && op.httpMethod.equalsIgnoreCase(group.httpMethod)) { if (op.path.startsWith(group.pathPrefix) && op.httpMethod.equalsIgnoreCase(group.httpMethod)) {
group.add(op); group.add(op);