Skip to content

Commit

Permalink
Change DefaultGenerator private accessors to protected
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarkWingDuckWing @frantuma
DarkWingDuckWing authored and frantuma committed Jan 30, 2019
1 parent e9bfc93 commit 5f2f8e1
Showing 1 changed file with 27 additions and 28 deletions.
55 changes: 27 additions & 28 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
protected ClientOptInput opts;
protected Swagger swagger;
protected CodegenIgnoreProcessor ignoreProcessor;
private Boolean generateApis = null;
private Boolean generateModels = null;
private Boolean generateSupportingFiles = null;
private Boolean generateApiTests = null;
private Boolean generateApiDocumentation = null;
private Boolean generateModelTests = null;
private Boolean generateModelDocumentation = null;
private Boolean generateSwaggerMetadata = true;
private String basePath;
private String basePathWithoutHost;
private String contextPath;
protected Boolean generateApis = null;
protected Boolean generateModels = null;
protected Boolean generateSupportingFiles = null;
protected Boolean generateApiTests = null;
protected Boolean generateApiDocumentation = null;
protected Boolean generateModelTests = null;
protected Boolean generateModelDocumentation = null;
protected Boolean generateSwaggerMetadata = true;
protected String basePath;
protected String basePathWithoutHost;
protected String contextPath;
private Map<String, String> generatorPropertyDefaults = new HashMap<>();

@Override
Expand Down Expand Up @@ -84,7 +84,7 @@ public void setGeneratorPropertyDefault(final String key, final String value) {
this.generatorPropertyDefaults.put(key, value);
}

private Boolean getGeneratorPropertyDefaultSwitch(final String key, final Boolean defaultValue) {
protected Boolean getGeneratorPropertyDefaultSwitch(final String key, final Boolean defaultValue) {
String result = null;
if (this.generatorPropertyDefaults.containsKey(key)) {
result = this.generatorPropertyDefaults.get(key);
Expand All @@ -95,7 +95,7 @@ private Boolean getGeneratorPropertyDefaultSwitch(final String key, final Boolea
return defaultValue;
}

private String getScheme() {
protected String getScheme() {
String scheme;
if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) {
scheme = config.escapeText(swagger.getSchemes().get(0).toValue());
Expand All @@ -122,7 +122,7 @@ private String getHost() {
return hostBuilder.toString();
}

private void configureGeneratorProperties() {
protected void configureGeneratorProperties() {
// allows generating only models by specifying a CSV of models to generate, or empty for all
// NOTE: Boolean.TRUE is required below rather than `true` because of JVM boxing constraints and type inference.
generateApis = System.getProperty(CodegenConstants.APIS) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.APIS, null);
Expand Down Expand Up @@ -184,7 +184,7 @@ private void configureGeneratorProperties() {

}

private void configureSwaggerInfo() {
protected void configureSwaggerInfo() {
Info info = swagger.getInfo();
if (info == null) {
return;
Expand Down Expand Up @@ -244,7 +244,7 @@ private void configureSwaggerInfo() {
}
}

private void generateModelTests(List<File> files, Map<String, Object> models, String modelName) throws IOException {
protected void generateModelTests(List<File> files, Map<String, Object> models, String modelName) throws IOException {
// to generate model test files
for (String templateName : config.modelTestTemplateFiles().keySet()) {
String suffix = config.modelTestTemplateFiles().get(templateName);
Expand All @@ -261,7 +261,7 @@ private void generateModelTests(List<File> files, Map<String, Object> models, St
}
}

private void generateModelDocumentation(List<File> files, Map<String, Object> models, String modelName) throws IOException {
protected void generateModelDocumentation(List<File> files, Map<String, Object> models, String modelName) throws IOException {
for (String templateName : config.modelDocTemplateFiles().keySet()) {
String suffix = config.modelDocTemplateFiles().get(templateName);
String filename = config.modelDocFileFolder() + File.separator + config.toModelDocFilename(modelName) + suffix;
Expand All @@ -276,7 +276,7 @@ private void generateModelDocumentation(List<File> files, Map<String, Object> mo
}
}

private void generateModels(List<File> files, List<Object> allModels) {
protected void generateModels(List<File> files, List<Object> allModels) {

if (!generateModels) {
return;
Expand Down Expand Up @@ -432,7 +432,7 @@ private Model getParent(Model model) {

}

private void generateApis(List<File> files, List<Object> allOperations, List<Object> allModels) {
protected void generateApis(List<File> files, List<Object> allOperations, List<Object> allModels) {
if (!generateApis) {
return;
}
Expand Down Expand Up @@ -554,7 +554,7 @@ public int compare(CodegenOperation one, CodegenOperation another) {

}

private void generateSupportingFiles(List<File> files, Map<String, Object> bundle) {
protected void generateSupportingFiles(List<File> files, Map<String, Object> bundle) {
if (!generateSupportingFiles) {
return;
}
Expand Down Expand Up @@ -687,7 +687,7 @@ public Reader getTemplate(String name) {

}

private Map<String, Object> buildSupportFileBundle(List<Object> allOperations, List<Object> allModels) {
protected Map<String, Object> buildSupportFileBundle(List<Object> allOperations, List<Object> allModels) {

Map<String, Object> bundle = new HashMap<String, Object>();
bundle.putAll(config.additionalProperties());
Expand Down Expand Up @@ -760,8 +760,7 @@ public List<File> generate() {
return files;
}


private File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename) throws IOException {
protected File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename) throws IOException {
String adjustedOutputFilename = outputFilename.replaceAll("//", "/").replace('/', File.separatorChar);
if (ignoreProcessor.allowsFile(new File(adjustedOutputFilename))) {
String templateFile = getFullTemplateFile(config, templateName);
Expand All @@ -786,7 +785,7 @@ public Reader getTemplate(String name) {
return null;
}

private static void processMimeTypes(List<String> mimeTypeList, Map<String, Object> operation, String source) {
protected static void processMimeTypes(List<String> mimeTypeList, Map<String, Object> operation, String source) {
if (mimeTypeList == null || mimeTypeList.isEmpty()) {
return;
}
Expand Down Expand Up @@ -824,7 +823,7 @@ public Map<String, List<CodegenOperation>> processPaths(Map<String, Path> paths)
return ops;
}

private void processOperation(String resourcePath, String httpMethod, Operation operation, Map<String, List<CodegenOperation>> operations, Path path) {
protected void processOperation(String resourcePath, String httpMethod, Operation operation, Map<String, List<CodegenOperation>> operations, Path path) {
if (operation == null) {
return;
}
Expand Down Expand Up @@ -943,12 +942,12 @@ private void processOperation(String resourcePath, String httpMethod, Operation

}

private static String generateParameterId(Parameter parameter) {
protected static String generateParameterId(Parameter parameter) {
return parameter.getName() + ":" + parameter.getIn();
}


private Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops, List<Object> allModels) {
protected Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops, List<Object> allModels) {
Map<String, Object> operations = new HashMap<String, Object>();
Map<String, Object> objs = new HashMap<String, Object>();
objs.put("classname", config.toApiName(tag));
Expand Down Expand Up @@ -1011,7 +1010,7 @@ private Map<String, Object> processOperations(CodegenConfig config, String tag,
}


private Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions, Map<String, Model> allDefinitions) {
protected Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions, Map<String, Model> allDefinitions) {
Map<String, Object> objs = new HashMap<String, Object>();
objs.put("package", config.modelPackage());
List<Object> models = new ArrayList<Object>();
Expand Down

0 comments on commit 5f2f8e1

Please sign in to comment.