From c3dfa5dbaba17b66f934c23fe59b6dca22e0afbd Mon Sep 17 00:00:00 2001 From: Kristof Vrolijkx Date: Tue, 19 Apr 2016 13:00:38 +0200 Subject: [PATCH] #1809 resolve casing conflict part2 --- ...2.java => TypeScriptAngular2ClientCodegen.java} | 4 ++-- .../services/io.swagger.codegen.CodegenConfig | 2 +- .../TypeScriptAngular2ClientOptionsTest.java | 4 ++-- .../TypeScriptAngular2ModelTest.java | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) rename modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/{TypeScriptAngular2ClientCodegen2.java => TypeScriptAngular2ClientCodegen.java} (94%) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen2.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java similarity index 94% rename from modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen2.java rename to modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java index 522736cb412..e23f4482dfa 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen2.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java @@ -9,9 +9,9 @@ import io.swagger.models.properties.FileProperty; import io.swagger.models.properties.MapProperty; import io.swagger.models.properties.Property; -public class TypeScriptAngular2ClientCodegen2 extends AbstractTypeScriptClientCodegen { +public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCodegen { - public TypeScriptAngular2ClientCodegen2() { + public TypeScriptAngular2ClientCodegen() { super(); this.outputFolder = "generated-code/typescript-angular2"; diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig index 0276b4b9c69..50d5357285d 100644 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig @@ -34,7 +34,7 @@ io.swagger.codegen.languages.SwaggerGenerator io.swagger.codegen.languages.SwaggerYamlGenerator io.swagger.codegen.languages.SwiftCodegen io.swagger.codegen.languages.TizenClientCodegen -io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen2 +io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen io.swagger.codegen.languages.TypeScriptAngularClientCodegen io.swagger.codegen.languages.TypeScriptNodeClientCodegen io.swagger.codegen.languages.AkkaScalaClientCodegen diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ClientOptionsTest.java index 6831fac4134..4c56a7dfab2 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ClientOptionsTest.java @@ -2,7 +2,7 @@ package io.swagger.codegen.typescriptangular2; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen2; +import io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen; import io.swagger.codegen.options.TypeScriptAngular2ClientOptionsProvider; import io.swagger.codegen.options.TypeScriptAngularClientOptionsProvider; import mockit.Expectations; @@ -11,7 +11,7 @@ import mockit.Tested; public class TypeScriptAngular2ClientOptionsTest extends AbstractOptionsTest { @Tested - private TypeScriptAngular2ClientCodegen2 clientCodegen; + private TypeScriptAngular2ClientCodegen clientCodegen; public TypeScriptAngular2ClientOptionsTest() { super(new TypeScriptAngular2ClientOptionsProvider()); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ModelTest.java index 33411d066f4..8f696801202 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ModelTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescriptangular2/TypeScriptAngular2ModelTest.java @@ -8,7 +8,7 @@ import org.testng.annotations.Test; import io.swagger.codegen.CodegenModel; import io.swagger.codegen.CodegenProperty; import io.swagger.codegen.DefaultCodegen; -import io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen2; +import io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen; import io.swagger.models.ArrayModel; import io.swagger.models.Model; import io.swagger.models.ModelImpl; @@ -30,7 +30,7 @@ public class TypeScriptAngular2ModelTest { .property("createdAt", new DateTimeProperty()) .required("id") .required("name"); - final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen2(); + final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen(); final CodegenModel cm = codegen.fromModel("sample", model); Assert.assertEquals(cm.name, "sample"); @@ -76,7 +76,7 @@ public class TypeScriptAngular2ModelTest { .property("id", new LongProperty()) .property("urls", new ArrayProperty().items(new StringProperty())) .required("id"); - final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen2(); + final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen(); final CodegenModel cm = codegen.fromModel("sample", model); Assert.assertEquals(cm.name, "sample"); @@ -109,7 +109,7 @@ public class TypeScriptAngular2ModelTest { final Model model = new ModelImpl() .description("a sample model") .property("children", new RefProperty("#/definitions/Children")); - final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen2(); + final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen(); final CodegenModel cm = codegen.fromModel("sample", model); Assert.assertEquals(cm.name, "sample"); @@ -133,7 +133,7 @@ public class TypeScriptAngular2ModelTest { .description("a sample model") .property("children", new ArrayProperty() .items(new RefProperty("#/definitions/Children"))); - final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen2(); + final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen(); final CodegenModel cm = codegen.fromModel("sample", model); Assert.assertEquals(cm.name, "sample"); @@ -156,7 +156,7 @@ public class TypeScriptAngular2ModelTest { final Model model = new ArrayModel() .description("an array model") .items(new RefProperty("#/definitions/Children")); - final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen2(); + final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen(); final CodegenModel cm = codegen.fromModel("sample", model); Assert.assertEquals(cm.name, "sample"); @@ -170,7 +170,7 @@ public class TypeScriptAngular2ModelTest { final Model model = new ModelImpl() .description("a map model") .additionalProperties(new RefProperty("#/definitions/Children")); - final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen2(); + final DefaultCodegen codegen = new TypeScriptAngular2ClientCodegen(); final CodegenModel cm = codegen.fromModel("sample", model); Assert.assertEquals(cm.name, "sample");