From 816ba6fb390cbe31d52122181f5cbf16dfc2e51b Mon Sep 17 00:00:00 2001 From: Kristof Vrolijkx Date: Wed, 18 May 2016 08:42:37 +0200 Subject: [PATCH 1/2] Code review remarks --- .../java/io/swagger/codegen/ClientOpts.java | 50 ++++++++++++++++--- .../java/io/swagger/codegen/CodegenModel.java | 2 + .../TypeScriptAngular2ClientCodegen.java | 2 +- ...ith-fake-endpoints-models-for-testing.yaml | 16 ++++++ 4 files changed, 63 insertions(+), 7 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java index 8de7476c5e2..172a057ea43 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java @@ -6,8 +6,27 @@ import java.util.Map; import io.swagger.codegen.auth.AuthMethod; public class ClientOpts { + protected String uri; + protected String target; protected AuthMethod auth; protected Map properties = new HashMap(); + protected String outputDirectory; + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } public Map getProperties() { return properties; @@ -17,10 +36,19 @@ public class ClientOpts { this.properties = properties; } + public String getOutputDirectory() { + return outputDirectory; + } + + public void setOutputDirectory(String outputDirectory) { + this.outputDirectory = outputDirectory; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("ClientOpts: {\n"); + sb.append(" uri: ").append(uri).append(","); sb.append(" auth: ").append(auth).append(","); sb.append(properties); sb.append("}"); @@ -29,20 +57,30 @@ public class ClientOpts { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; ClientOpts that = (ClientOpts) o; - if (auth != null ? !auth.equals(that.auth) : that.auth != null) { return false; } - return getProperties().equals(that.getProperties()); + if (uri != null ? !uri.equals(that.uri) : that.uri != null) + return false; + if (target != null ? !target.equals(that.target) : that.target != null) + return false; + if (auth != null ? !auth.equals(that.auth) : that.auth != null) + return false; + if (properties != null ? !properties.equals(that.properties) : that.properties != null) + return false; + return outputDirectory != null ? outputDirectory.equals(that.outputDirectory) : that.outputDirectory == null; } @Override public int hashCode() { - int result = auth != null ? auth.hashCode() : 0; - result = 31 * result + getProperties().hashCode(); + int result = uri != null ? uri.hashCode() : 0; + result = 31 * result + (target != null ? target.hashCode() : 0); + result = 31 * result + (auth != null ? auth.hashCode() : 0); + result = 31 * result + (properties != null ? properties.hashCode() : 0); + result = 31 * result + (outputDirectory != null ? outputDirectory.hashCode() : 0); return result; } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java index 34c4124320f..05883df4cfc 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java @@ -37,6 +37,8 @@ public class CodegenModel { public ExternalDocs externalDocs; public Map vendorExtensions; + + //The type of the value from additional properties. Used in map like objects. public String additionalPropertiesType; { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java index 0b1df6bfaf5..aa14a565d10 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java @@ -139,7 +139,7 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod @Override public void postProcessParameter(CodegenParameter parameter) { super.postProcessParameter(parameter); - parameter.dataType = addModelPrefix(parameter.dataType); + parameter.dataType = addModelPrefix(parameter.dataType); } public String getNpmName() { diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index b9fa750d38a..6b4fc91b50e 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -944,6 +944,22 @@ definitions: enum: - 1.1 - -1.2 + AdditionalPropertiesClass: + type: object + additionalProperties: + type: string + MixedPropertiesAndAdditionalPropertiesClass: + type: object + properties: + uuid: + type: string + format: uuid + dateTime: + type: string + format: date-time + additionalProperties: + type: string + $ref: '#/definitions/Animal' externalDocs: description: Find out more about Swagger url: 'http://swagger.io' From 7e3faed37b00344d383a8a04003612fb4a09256a Mon Sep 17 00:00:00 2001 From: Kristof Vrolijkx Date: Thu, 19 May 2016 20:03:39 +0200 Subject: [PATCH 2/2] small code cleanump --- .../AbstractTypeScriptClientCodegen.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java index 9e30ae657c8..44aa03bde23 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -1,13 +1,24 @@ package io.swagger.codegen.languages; -import io.swagger.codegen.*; -import io.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - import org.apache.commons.lang3.StringUtils; +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConfig; +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenProperty; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.DefaultCodegen; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.FileProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; + public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig { protected String modelPropertyNaming= "camelCase"; @@ -33,10 +44,10 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp "Long", "Float", "Object", - "Array", - "Date", - "number", - "any" + "Array", + "Date", + "number", + "any" )); instantiationTypes.put("array", "Array");