loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

moved constants to codegen constants class.

Browse Source
This commit is contained in:
Hugo Mercado
2017-11-29 15:36:18 -05:00
parent 00d493bc36
commit 099a4e3ae9
27 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
View File

@@ -1,5 +1,8 @@
package io.swagger.codegen;
import static io.swagger.codegen.VendorExtendable.PREFFIX_HAS;
import static io.swagger.codegen.VendorExtendable.PREFFIX_IS;
/**
* A class for storing constants that are used throughout the project.
*/
@@ -220,4 +223,15 @@ public class CodegenConstants {
public static final String REMOVE_OPERATION_ID_PREFIX = "removeOperationIdPrefix";
public static final String REMOVE_OPERATION_ID_PREFIX_DESC = "Remove prefix of operationId, e.g. config_getId => getId";
public static final String IS_ENUM_EXT_NAME = PREFFIX_IS + "enum";
public static final String IS_ALIAS_EXT_NAME = PREFFIX_IS + "alias";
public static final String IS_ARRAY_MODEL_EXT_NAME = PREFFIX_IS + "array-model";
public static final String HAS_VARS_EXT_NAME = PREFFIX_HAS + "vars";
public static final String HAS_ENUMS_EXT_NAME = PREFFIX_HAS + "enums";
public static final String HAS_MORE_MODELS_EXT_NAME = PREFFIX_HAS + "more-models";
public static final String HAS_REQUIRED_EXT_NAME = PREFFIX_HAS + "required";
public static final String HAS_OPTIONAL_EXT_NAME = PREFFIX_HAS + "optional";
public static final String HAS_CHILDREN_EXT_NAME = PREFFIX_HAS + "children";
public static final String HAS_ONLY_READ_ONLY_EXT_NAME = PREFFIX_HAS + "only-read-only";
}

11
modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
View File

@@ -13,17 +13,6 @@ import java.util.TreeSet;
public class CodegenModel implements VendorExtendable {
public static final String IS_ENUM_EXT_NAME = PREFFIX_IS + "enum";
public static final String IS_ALIAS_EXT_NAME = PREFFIX_IS + "alias";
public static final String IS_ARRAY_MODEL_EXT_NAME = PREFFIX_IS + "array-model";
public static final String HAS_VARS_EXT_NAME = PREFFIX_HAS + "vars";
public static final String HAS_ENUMS_EXT_NAME = PREFFIX_HAS + "enums";
public static final String HAS_MORE_MODELS_EXT_NAME = PREFFIX_HAS + "more-models";
public static final String HAS_REQUIRED_EXT_NAME = PREFFIX_HAS + "required";
public static final String HAS_OPTIONAL_EXT_NAME = PREFFIX_HAS + "optional";
public static final String HAS_CHILDREN_EXT_NAME = PREFFIX_HAS + "children";
public static final String HAS_ONLY_READ_ONLY_EXT_NAME = PREFFIX_HAS + "only-read-only";
public String parent, parentSchema;
public List<String> interfaces;

10
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@@ -64,11 +64,11 @@ import static io.swagger.codegen.CodegenHelper.getDefaultIncludes;
import static io.swagger.codegen.CodegenHelper.getImportMappings;
import static io.swagger.codegen.CodegenHelper.getTypeMappings;
import static io.swagger.codegen.CodegenHelper.initalizeSpecialCharacterMapping;
import static io.swagger.codegen.CodegenModel.HAS_ONLY_READ_ONLY_EXT_NAME;
import static io.swagger.codegen.CodegenModel.HAS_OPTIONAL_EXT_NAME;
import static io.swagger.codegen.CodegenModel.HAS_REQUIRED_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ARRAY_MODEL_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ONLY_READ_ONLY_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_OPTIONAL_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_REQUIRED_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ARRAY_MODEL_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
import static io.swagger.codegen.utils.ModelUtils.processCodegenModels;
import static io.swagger.codegen.utils.ModelUtils.processModelEnums;

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
View File

@@ -702,7 +702,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
for (int i = 0; i < allModels.size() - 1; i++) {
HashMap<String, CodegenModel> cm = (HashMap<String, CodegenModel>) allModels.get(i);
CodegenModel m = cm.get("model");
m.getVendorExtensions().put(CodegenModel.HAS_MORE_MODELS_EXT_NAME, Boolean.TRUE);
m.getVendorExtensions().put(CodegenConstants.HAS_MORE_MODELS_EXT_NAME, Boolean.TRUE);
}
config.postProcessSupportingFileData(bundle);

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
View File

@@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
import static io.swagger.codegen.utils.ModelUtils.updateCodegenPropertyEnum;

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractEiffelCodegen.java
View File

@@ -1,8 +1,8 @@
package io.swagger.codegen.languages;
import static com.google.common.base.Strings.isNullOrEmpty;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
import java.util.Arrays;

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
View File

@@ -43,8 +43,8 @@ import io.swagger.codegen.CodegenParameter;
import io.swagger.codegen.CodegenProperty;
import io.swagger.codegen.DefaultCodegen;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
View File

@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig {

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ApexClientCodegen.java
View File

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class ApexClientCodegen extends AbstractJavaCodegen {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
View File

@@ -21,8 +21,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
import static org.apache.commons.lang3.StringUtils.isEmpty;

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java
View File

@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellHttpClientCodegen.java
View File

@@ -35,7 +35,7 @@ import org.apache.commons.lang3.tuple.Pair;
import java.util.regex.Matcher;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenConfig {

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
View File

@@ -1,6 +1,6 @@
package io.swagger.codegen.languages;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
import static java.util.Collections.sort;

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
View File

@@ -18,8 +18,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavaInflectorServerCodegen extends AbstractJavaCodegen {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java
View File

@@ -12,8 +12,8 @@ import io.swagger.oas.models.Operation;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaMSF4JServerCodegen.java
View File

@@ -15,8 +15,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavaMSF4JServerCodegen extends AbstractJavaJAXRSServerCodegen {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyEapServerCodegen.java
View File

@@ -18,8 +18,8 @@ import io.swagger.codegen.languages.features.BeanValidationFeatures;
import io.swagger.codegen.languages.features.JbossFeature;
import io.swagger.codegen.languages.features.SwaggerFeatures;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavaResteasyEapServerCodegen extends AbstractJavaJAXRSServerCodegen

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
View File

@@ -15,8 +15,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen implements JbossFeature {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaVertXServerCodegen.java
View File

@@ -21,8 +21,8 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavaVertXServerCodegen extends AbstractJavaCodegen {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
View File

@@ -34,8 +34,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig {

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java
View File

@@ -19,7 +19,7 @@ import io.swagger.oas.models.media.MapSchema;
import io.swagger.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implements CodegenConfig {

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java
View File

@@ -250,7 +250,7 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen {
log.debug("Processing parents: " + parentModels);
for (final String parent : parentModels) {
final CodegenModel parentModel = ModelUtils.getModelByName(parent, models);
parentModel.getVendorExtensions().put(CodegenModel.HAS_CHILDREN_EXT_NAME, Boolean.TRUE);
parentModel.getVendorExtensions().put(CodegenConstants.HAS_CHILDREN_EXT_NAME, Boolean.TRUE);
final Collection<CodegenModel> childrenModels = childrenByParent.get(parent);
for (final CodegenModel child : childrenModels) {
processParentPropertiesInChildModel(parentModel, child);

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java
View File

@@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils;
import java.util.*;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements CodegenConfig {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
View File

@@ -31,8 +31,8 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
View File

@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
/**

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAureliaClientCodegen.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCodegen {

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/UndertowCodegen.java
View File

@@ -16,8 +16,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static io.swagger.codegen.CodegenModel.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenModel.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.HAS_ENUMS_EXT_NAME;
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
public class UndertowCodegen extends AbstractJavaCodegen {