Merge pull request #2286 from xhh/clj-api-name

[Clojure] Improve api name for the Clojure client

Author: wing328

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java

@@ -105,6 +105,8 @@ public interface CodegenConfig {
 
     void processSwagger(Swagger swagger);
 
+    String sanitizeTag(String tag);
+
     String toApiFilename(String name);
 
     String toModelFilename(String name);

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -2293,6 +2293,19 @@ public String sanitizeName(String name) {
         return name.replaceAll("[^a-zA-Z0-9_]", "");
     }
 
+    @SuppressWarnings("static-method")
+    public String sanitizeTag(String tag) {
+        // remove spaces and make strong case
+        String[] parts = tag.split(" ");
+        StringBuilder buf = new StringBuilder();
+        for (String part : parts) {
+            if (StringUtils.isNotEmpty(part)) {
+                buf.append(StringUtils.capitalize(part));
+            }
+        }
+        return buf.toString().replaceAll("[^a-zA-Z ]", "");
+    }
+
     /**
      * Only write if the file doesn't exist
      *

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java

@@ -15,7 +15,6 @@
 import java.io.*;
 import java.util.*;
 
-import static org.apache.commons.lang3.StringUtils.capitalize;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 public class DefaultGenerator extends AbstractGenerator implements Generator {
@@ -623,8 +622,8 @@ public void processOperation(String resourcePath, String httpMethod, Operation o
                 try {
                     co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions(), swagger);
                     co.tags = new ArrayList<String>();
-                    co.tags.add(sanitizeTag(tag));
-                    config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations);
+                    co.tags.add(config.sanitizeTag(tag));
+                    config.addOperationToGroup(config.sanitizeTag(tag), resourcePath, operation, co, operations);
 
                     List<Map<String, List<String>>> securities = operation.getSecurity();
                     if (securities == null && swagger.getSecurity() != null) {
@@ -683,19 +682,6 @@ private static String generateParameterId(Parameter parameter) {
         return parameter.getName() + ":" + parameter.getIn();
     }
 
-    @SuppressWarnings("static-method")
-    protected String sanitizeTag(String tag) {
-        // remove spaces and make strong case
-        String[] parts = tag.split(" ");
-        StringBuilder buf = new StringBuilder();
-        for (String part : parts) {
-            if (isNotEmpty(part)) {
-                buf.append(capitalize(part));
-            }
-        }
-        return buf.toString().replaceAll("[^a-zA-Z ]", "");
-    }
-
     @SuppressWarnings("static-method")
     public Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops) {
         Map<String, Object> operations = new HashMap<String, Object>();

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ClojureClientCodegen.java

@@ -145,6 +145,11 @@ public void preprocessSwagger(Swagger swagger) {
         supportingFiles.add(new SupportingFile("core.mustache", baseNamespaceFolder, "core.clj"));
     }
 
+    @Override
+    public String sanitizeTag(String tag) {
+        return tag.replaceAll("[^a-zA-Z_]+", "_");
+    }
+
     @Override
     public String apiFileFolder() {
         return outputFolder + File.separator + sourceFolder + File.separator + namespaceToFolder(apiPackage);

modules/swagger-codegen/src/test/java/io/swagger/codegen/languages/ClojureClientCodegenTest.java

@@ -0,0 +1,38 @@
+package io.swagger.codegen.languages;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class ClojureClientCodegenTest {
+    ClojureClientCodegen codegen = new ClojureClientCodegen();
+
+    @Test
+    public void testSanitizeTag() throws Exception {
+        Assert.assertEquals(codegen.sanitizeTag("users-api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("users_api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("users api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("users.api"), "users_api");
+        Assert.assertEquals(codegen.sanitizeTag("Users Api"), "Users_Api");
+        Assert.assertEquals(codegen.sanitizeTag("UsersApi"), "UsersApi");
+        Assert.assertEquals(codegen.sanitizeTag("usersapi"), "usersapi");
+        Assert.assertEquals(codegen.sanitizeTag("Usersapi"), "Usersapi");
+    }
+
+    @Test
+    public void testToApiName() throws Exception {
+        Assert.assertEquals(codegen.toApiName("users_api"), "users-api");
+        Assert.assertEquals(codegen.toApiName("Users_Api"), "users-api");
+        Assert.assertEquals(codegen.toApiName("UsersApi"), "users-api");
+        Assert.assertEquals(codegen.toApiName("usersapi"), "usersapi");
+        Assert.assertEquals(codegen.toApiName("Usersapi"), "usersapi");
+    }
+
+    @Test
+    public void testToApiFilename() throws Exception {
+        Assert.assertEquals(codegen.toApiFilename("users_api"), "users_api");
+        Assert.assertEquals(codegen.toApiFilename("Users_Api"), "users_api");
+        Assert.assertEquals(codegen.toApiFilename("UsersApi"), "users_api");
+        Assert.assertEquals(codegen.toApiFilename("usersapi"), "usersapi");
+        Assert.assertEquals(codegen.toApiFilename("Usersapi"), "usersapi");
+    }
+}