diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java index 6eee8734975..0f06e4df6fe 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttp4sServerCodegen.java @@ -1,4 +1,6 @@ /* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -66,7 +68,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC supportsMultipleInheritance = true; supportsInheritance = true; supportsMixins = true; - addOneOfInterfaceImports =true; + addOneOfInterfaceImports = true; setReservedWordsLowerCase( @@ -141,7 +143,6 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); - languageSpecificPrimitives = new HashSet<>( Arrays.asList( "String", @@ -197,6 +198,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC } private final static Map locationStatusToResponse = new HashMap<>(); + static { locationStatusToResponse.put("300", "MultipleChoices"); locationStatusToResponse.put("301", "MovedPermanently"); @@ -207,16 +209,19 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC } private final static Map wwwAuthStatusToResponse = new HashMap<>(); + static { wwwAuthStatusToResponse.put("401", "Unauthorized"); } private final static Map allowStatusToResponse = new HashMap<>(); + static { allowStatusToResponse.put("405", "MethodNotAllowed"); } private final static Map proxyAuthStatusToResponse = new HashMap<>(); + static { proxyAuthStatusToResponse.put("407", "ProxyAuthenticationRequired"); } @@ -314,7 +319,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC apiTemplateFiles.put("api.mustache", ".scala"); - if (!additionalProperties.containsKey(EXCLUDE_SBT) && !Boolean.parseBoolean((String)additionalProperties.get(EXCLUDE_SBT))) { + if (!additionalProperties.containsKey(EXCLUDE_SBT) && !Boolean.parseBoolean((String) additionalProperties.get(EXCLUDE_SBT))) { supportingFiles.add(new SupportingFile("build.sbt", "", "build.sbt")); supportingFiles.add(new SupportingFile("build.properties", "project", "build.properties")); } @@ -328,18 +333,18 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC @Override public boolean isEnablePostProcessFile() { - return true; + return true; } @Override public void postProcessFile(File file, String fileType) { - System.out.println("postprocess " + file.toString()); + LOGGER.debug("postprocess " + file.toString()); super.postProcessFile(file, fileType); } @Override public Map postProcessAllModels(Map objs) { - Map modelsMap = super.postProcessAllModels(objs); + Map modelsMap = super.postProcessAllModels(objs); for (ModelsMap mm : modelsMap.values()) { for (ModelMap model : mm.getModels()) { @@ -367,7 +372,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC // add refined constraints - for (CodegenProperty prop: cModel.vars) { + for (CodegenProperty prop : cModel.vars) { Set imports = new TreeSet<>(); prop.getVendorExtensions().putAll(refineProp(prop, imports)); @@ -389,8 +394,8 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC vendorExtensions.put("x-type", "Refined[" + dataType + ", " + refinedRgt + "]"); vendorExtensions.put("x-refined-lft", dataType); - vendorExtensions.put("x-refined-rgt", refinedRgt); - vendorExtensions.put("x-refined", true); + vendorExtensions.put("x-refined-rgt", refinedRgt); + vendorExtensions.put("x-refined", true); } else { vendorExtensions.put("x-type", dataType); } @@ -407,8 +412,8 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC ArrayList refined = new ArrayList<>(); if (prop.getMinLength() != null) { - refined.add("MinSize[" + prop.getMinLength() + "]"); - imports.add("MinSize"); + refined.add("MinSize[" + prop.getMinLength() + "]"); + imports.add("MinSize"); } if (prop.getMaxLength() != null) { refined.add("MaxSize[" + prop.getMaxLength() + "]"); @@ -485,7 +490,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC List models = (List) bundle.get("models"); TreeSet allImports = new TreeSet<>(); - for (ModelMap mm: models) { + for (ModelMap mm : models) { for (String nextImport : mm.getModel().imports) { String mapping = importMapping().get(nextImport); if (mapping != null && !defaultIncludes().contains(mapping)) { @@ -504,9 +509,9 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC ApiInfoMap apiInfoMap = (ApiInfoMap) bundle.get("apiInfo"); Map> authToOperationMap = new TreeMap<>(); - for (OperationsMap op: apiInfoMap.getApis()) { + for (OperationsMap op : apiInfoMap.getApis()) { List> opsByAuth = (List>) op.get("operationsByAuth"); - for (HashMap auth: opsByAuth) { + for (HashMap auth : opsByAuth) { String autName = (String) auth.get("auth"); String classname = (String) op.get("classname"); List classnames = authToOperationMap.computeIfAbsent(autName, k -> new ArrayList<>()); @@ -549,7 +554,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC @Override public String apiFileFolder() { - return outputFolder + File.separator + apiFileFolderRelative() ; + return outputFolder + File.separator + apiFileFolderRelative(); } private String apiFileFolderRelative() { @@ -599,7 +604,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC } // decide wat methods do we need in responses: - for (CodegenResponse resp: op.responses) { + for (CodegenResponse resp : op.responses) { if (resp.code.equals("0")) resp.code = "200"; // 200 by default @@ -649,11 +654,11 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC } if (op.authMethods != null) { - for (CodegenSecurity cs: op.authMethods) { + for (CodegenSecurity cs : op.authMethods) { allAuth.add(cs.name); } List> authDup = new ArrayList<>(); - for (CodegenSecurity authMeth: op.authMethods) { + for (CodegenSecurity authMeth : op.authMethods) { Map vals = new HashMap<>(); vals.put("authName", authMeth.name); vals.put("operation", op); @@ -781,7 +786,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC op.imports.addAll(imports); } - private String cpToPathParameter(CodegenParameter cp, Set imports, Map vendorExtensions) { + private String cpToPathParameter(CodegenParameter cp, Set imports, Map vendorExtensions) { // don't support containers and arrays yet, reset to string if (cp.isContainer || cp.isArray) { cp.setDataType("String"); @@ -809,20 +814,20 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC String queryString = ""; for (CodegenParameter cp : op.queryParams) { - if (queryString.isEmpty()) { - queryString = queryString + " :? "; - } else { - queryString = queryString + " +& "; - } + if (queryString.isEmpty()) { + queryString = queryString + " :? "; + } else { + queryString = queryString + " +& "; + } - queryString = queryString + cpToQueryParameter(cp, imports, cp.vendorExtensions); + queryString = queryString + cpToQueryParameter(cp, imports, cp.vendorExtensions); } op.vendorExtensions.put("x-codegen-query", queryString); op.imports.addAll(imports); } - private String cpToQueryParameter(CodegenParameter cp, Set imports, Map vendorExtensions) { + private String cpToQueryParameter(CodegenParameter cp, Set imports, Map vendorExtensions) { // don't support containers and arrays yet, reset to string if (cp.isContainer && !cp.isArray) { cp.setDataType("String"); @@ -848,5 +853,7 @@ public class ScalaHttp4sServerCodegen extends DefaultCodegen implements CodegenC } @Override - public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.SCALA; } + public GeneratorLanguage generatorLanguage() { + return GeneratorLanguage.SCALA; + } } diff --git a/pom.xml b/pom.xml index 77697243440..a1f58d95f43 100644 --- a/pom.xml +++ b/pom.xml @@ -414,7 +414,6 @@ - release @@ -447,7 +446,6 @@ - release-sign-artifacts