From 152b95d0dea3fd40a245b8f1be31852402844ccb Mon Sep 17 00:00:00 2001 From: Wang lei Date: Thu, 30 Nov 2017 09:44:51 +0800 Subject: [PATCH 1/3] delete unused method in the test --- .../io/servicecomb/common/javassist/TestJavassistUtils.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java b/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java index 5aea644b44c..36f246a582c 100644 --- a/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java +++ b/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java @@ -54,29 +54,23 @@ public void testField() throws Exception { Class cls = JavassistUtils.createClass(classConfig); - // intField Field field = cls.getField("intField"); Assert.assertEquals(Integer.class, field.getType()); Method method = cls.getMethod("getIntField"); Assert.assertEquals(Integer.class, method.getReturnType()); - method = cls.getMethod("setIntField", Integer.class); - // intArrayField field = cls.getField("intArrayField"); Assert.assertEquals(int[].class, field.getType()); method = cls.getMethod("getIntArrayField"); Assert.assertEquals(int[].class, method.getReturnType()); - method = cls.getMethod("setIntArrayField", int[].class); - // listStringField field = cls.getField("listStringField"); Assert.assertEquals("java.util.List", field.getGenericType().getTypeName()); method = cls.getMethod("getListStringField"); Assert.assertEquals("java.util.List", method.getGenericReturnType().getTypeName()); - method = cls.getMethod("setListStringField", List.class); } @Test From 10b6607222765f5409b7e02e46a675904c2010a4 Mon Sep 17 00:00:00 2001 From: Wang lei Date: Thu, 30 Nov 2017 09:46:35 +0800 Subject: [PATCH 2/3] Add the rule to ignore IDEA project files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b298460c12b..03596abdf35 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,8 @@ __pycache__/ # IntelliJ, based on http://devnet.jetbrains.net/docs/DOC-1186 .idea/ *.iml +*.ipr +*.iws # logs and trace *.log From 8ddee4358cc5716f701443335b9bd0b0e38c9908 Mon Sep 17 00:00:00 2001 From: Wang lei Date: Thu, 30 Nov 2017 09:49:50 +0800 Subject: [PATCH 3/3] clean the format and remove unused code --- .../servicecomb/common/javassist/TestJavassistUtils.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java b/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java index 36f246a582c..aa318045c20 100644 --- a/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java +++ b/common/common-javassist/src/test/java/io/servicecomb/common/javassist/TestJavassistUtils.java @@ -80,7 +80,6 @@ public void testAddParameter() { String intfName = "cse.ut.TestAddParameter"; classConfig.setClassName(intfName); - // List method(Map map, Set set) MethodConfig methodConfig = new MethodConfig(); methodConfig.setName("method"); methodConfig.setResult(TypeFactory.defaultInstance().constructCollectionType(List.class, String.class)); @@ -192,10 +191,8 @@ public void testGetNameForGenerateCode() { @Test public void managerClassPool() { - ClassLoader classLoader1 = new ClassLoader() { - }; - ClassLoader classLoader2 = new ClassLoader() { - }; + ClassLoader classLoader1 = new ClassLoader() { }; + ClassLoader classLoader2 = new ClassLoader() { }; ClassPool p1 = Deencapsulation.invoke(JavassistUtils.class, "getOrCreateClassPool", classLoader1); ClassPool p2 = Deencapsulation.invoke(JavassistUtils.class, "getOrCreateClassPool", classLoader2);