You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/05/09 17:31:11 UTC

[incubator-servicecomb-java-chassis] 04/07: [SCB-538][WIP] avoid copy java keywords in test case

This is an automated email from the ASF dual-hosted git repository.

wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 4e595d2103f1fc2e69177b2b5d21c9544a9db933
Author: wujimin <wu...@huawei.com>
AuthorDate: Fri May 4 09:24:25 2018 +0800

    [SCB-538][WIP] avoid copy java keywords in test case
---
 .../swagger/generator/core/utils/ClassUtils.java   |  3 -
 .../swagger/generator/core/TestClassUtils.java     | 65 +---------------------
 2 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ClassUtils.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ClassUtils.java
index f9a33f3..20da1ec 100644
--- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ClassUtils.java
+++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ClassUtils.java
@@ -45,9 +45,6 @@ import io.swagger.models.parameters.Parameter;
 import io.swagger.models.properties.Property;
 
 public final class ClassUtils {
-  // reference:
-  //  https://docs.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
-  //  https://en.wikipedia.org/wiki/List_of_Java_keywords
   private ClassUtils() {
   }
 
diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
index a23702c..e49aea2 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
@@ -50,67 +50,6 @@ import mockit.Deencapsulation;
 
 @SwaggerDefinition
 public class TestClassUtils {
-  // copy from ClassUtils
-  // do not use JAVA_RESERVED_WORDS in ClassUtils directly
-  // because that's the test target.
-  private static final Set<String> JAVA_RESERVED_WORDS = new HashSet<>();
-
-  static {
-    JAVA_RESERVED_WORDS.addAll(Arrays.asList("true",
-        "false",
-        "null",
-        "abstract",
-        "continue",
-        "for",
-        "new",
-        "switch",
-        "assert",
-        "default",
-        "goto",
-        "package",
-        "synchronized",
-        "boolean",
-        "do",
-        "if",
-        "private",
-        "this",
-        "break",
-        "double",
-        "implements",
-        "protected",
-        "throw",
-        "byte",
-        "else",
-        "import",
-        "public",
-        "throws",
-        "case",
-        "enum",
-        "instanceof",
-        "return",
-        "transient",
-        "catch",
-        "extends",
-        "int",
-        "short",
-        "try",
-        "char",
-        "final",
-        "interface",
-        "static",
-        "void",
-        "class",
-        "finally",
-        "long",
-        "strictfp",
-        "volatile",
-        "const",
-        "float",
-        "native",
-        "super",
-        "while"));
-  }
-
   ClassLoader classLoader = new ClassLoader() {
   };
 
@@ -166,7 +105,9 @@ public class TestClassUtils {
   }
 
   @Test
-  public void testCorrectClassNameReservedWords() {
+  public void testCorrectClassNameReservedWords() throws IllegalAccessException {
+    @SuppressWarnings("unchecked")
+    Set<String> JAVA_RESERVED_WORDS = (Set<String>) FieldUtils.readStaticField(SourceVersion.class, "keywords", true);
     String name = String.join(".", JAVA_RESERVED_WORDS);
     String expectResult = "_" + String.join("._", JAVA_RESERVED_WORDS);
 

-- 
To stop receiving notification emails like this one, please contact
wujimin@apache.org.