Skip to content

Commit 85c81e8

Browse files
authored
scala cask fix for missing annotations on simple routes (#18371)
1 parent 8618658 commit 85c81e8

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import io.swagger.v3.oas.models.OpenAPI;
2020
import io.swagger.v3.oas.models.media.Schema;
21-
import io.swagger.v3.oas.models.tags.Tag;
2221
import org.apache.commons.io.FileUtils;
2322
import org.openapitools.codegen.*;
2423
import org.openapitools.codegen.model.ModelMap;
@@ -32,7 +31,6 @@
3231
import java.io.File;
3332
import java.nio.charset.StandardCharsets;
3433
import java.util.*;
35-
import java.util.regex.PatternSyntaxException;
3634
import java.util.stream.Collectors;
3735
import java.util.stream.Stream;
3836

@@ -152,6 +150,7 @@ private String ensureProp(String key, String defaultValue) {
152150
return defaultValue;
153151
}
154152
}
153+
155154
@Override
156155
public void processOpts() {
157156
super.processOpts();
@@ -521,13 +520,14 @@ static List<ScalaCaskServerCodegen.OperationGroup> createRouteGroups(List<Codege
521520

522521
List<ScalaCaskServerCodegen.OperationGroup> groups = group(operationList);
523522
operationList.forEach((op) -> {
524-
for (final ScalaCaskServerCodegen.OperationGroup group : groups) {
525-
// for the usage/call site
526-
final String scalaPath = pathWithBracketPlaceholdersRemovedAndXPathIndexAdded(op);
527-
op.vendorExtensions.put("x-cask-path", scalaPath);
523+
// for the usage/call site
524+
final String scalaPath = pathWithBracketPlaceholdersRemovedAndXPathIndexAdded(op);
525+
op.vendorExtensions.put("x-cask-path", scalaPath);
528526

529-
final String annotation = "@cask." + op.httpMethod.toLowerCase(Locale.ROOT);
530-
op.vendorExtensions.put("x-annotation", annotation);
527+
final String annotation = "@cask." + op.httpMethod.toLowerCase(Locale.ROOT);
528+
op.vendorExtensions.put("x-annotation", annotation);
529+
530+
for (final ScalaCaskServerCodegen.OperationGroup group : groups) {
531531
if (!group.contains(op)) {
532532
if (op.path.startsWith(group.pathPrefix) && op.httpMethod.equalsIgnoreCase(group.httpMethod)) {
533533
group.add(op);

0 commit comments

Comments
 (0)