diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
index eab873b0cf5..3036185dc5a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
@@ -17,7 +17,7 @@ public class CodegenOperation {
             isListContainer, isMultipart, hasMore = true,
             isResponseBinary = false, isResponseFile = false, hasReference = false,
             isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy,
-            isRestful, isDeprecated, hasOnlyBodyParams = false;
+            isRestful, isDeprecated, hasOnlyBodyParams, hasNoParams = false;
     public String path, testPath, operationId, returnType, httpMethod, returnBaseType,
             returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse, discriminator;
     public List<Map<String, String>> consumes, produces, prioritizedContentTypes;
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 e3e5ab85e1b..06ecc914299 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
@@ -2435,6 +2435,10 @@ public int compare(CodegenParameter one, CodegenParameter another) {
         // only body
         op.hasOnlyBodyParams = op.bodyParams.size() > 0 && op.pathParams.size() == 0 && op.queryParams.size() == 0 && op.headerParams.size() == 0 && op.formParams.size() == 0;
 
+
+        // has no params
+        op.hasNoParams = op.bodyParams.size() == 0 && op.pathParams.size() == 0 && op.queryParams.size() == 0 && op.headerParams.size() == 0 && op.formParams.size() == 0;
+
         // set Restful Flag
         op.isRestfulShow = op.isRestfulShow();
         op.isRestfulIndex = op.isRestfulIndex();
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 f39e40d242e..cc037b50aaf 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
@@ -463,10 +463,14 @@ public String toEnumVarName(String name, String datatype) {
             return varName;
         }
 
+        Boolean tmpAllowUnicodeIdentifiers = this.allowUnicodeIdentifiers;
+        this.allowUnicodeIdentifiers = true;
+
         // string
         String enumName = sanitizeName(name);
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
+        this.allowUnicodeIdentifiers = tmpAllowUnicodeIdentifiers;
 
         // camelize the enum variable name
         // ref: https://basarat.gitbooks.io/typescript/content/docs/enums.html