From 1446f4a13e06c2801ccf48f9a43f925d2da8ab5d Mon Sep 17 00:00:00 2001 From: Antonio Spinelli Date: Sun, 21 Feb 2016 01:33:01 -0300 Subject: [PATCH] remove support to inner class fix #2191 PR #2192 --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 8 -------- .../io/swagger/codegen/languages/PhpClientCodegen.java | 4 ---- 2 files changed, 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 429ede03638..b1b79498b73 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -2095,14 +2095,6 @@ public class DefaultCodegen { word = m.replaceAll(rep); } - // Replace two underscores with $ to support inner classes. - p = Pattern.compile("(__)(.)"); - m = p.matcher(word); - while (m.find()) { - word = m.replaceFirst("\\$" + m.group(2).toUpperCase()); - m = p.matcher(word); - } - // Remove all underscores p = Pattern.compile("(_)(.)"); m = p.matcher(word); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java index 80e88c0fb4b..1046add66ec 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java @@ -372,10 +372,6 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { return camelize(name); } - public static String camelize(String word) { - return DefaultCodegen.camelize(word).replaceAll("\\$", ""); - } - @Override public String toModelFilename(String name) { // should be the same as the model name