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

Removed ‘conflicted’ commented code.

Browse Source
This commit is contained in:
Hugo Mercado
2017-12-21 14:33:27 -05:00
parent 7bde281c24
commit 5ad322ca31
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,16 +442,6 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
* @return a string value used as the `dataType` field for model templates, `returnType` for api templates
*/
@Override
/**
<<<<<<< HEAD
public String getTypeDeclaration(Schema propertySchema) {
if (propertySchema instanceof ArraySchema) {
Schema inner = ((ArraySchema) propertySchema).getItems();
return String.format("%s[%s]", getSchemaType(propertySchema), getTypeDeclaration(inner));
} else if (propertySchema instanceof MapSchema) {
Schema inner = propertySchema.getAdditionalProperties();
return String.format("%s[String, %s]", getSchemaType(propertySchema), getTypeDeclaration(inner));
=======*/
public String getTypeDeclaration(Schema propertySchema) {
// SubClasses of AbstractProperty
//

6
pom.xml.shippable
View File

@@ -912,9 +912,9 @@
</repositories>
<properties>
<swagger-parser-version>2.0.0-SNAPSHOT</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>2.0.0-SNAPSHOT</swagger-core-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<swagger-core-version>2.0.0-SNAPSHOT</swagger-core-version>
<commons-io-version>2.4</commons-io-version>
<commons-cli-version>1.2</commons-cli-version>
<junit-version>4.8.1</junit-version>