[GitHub] WillemJiang closed pull request #465: [JAV-590] add null pointer check in ClassUtils

[GitBox <gi...@apache.org>]

WillemJiang closed pull request #465: [JAV-590] add null pointer check in ClassUtils
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/465
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/swagger/swagger-generator/generator-core/src/main/java/io/servicecomb/swagger/generator/core/utils/ClassUtils.java b/swagger/swagger-generator/generator-core/src/main/java/io/servicecomb/swagger/generator/core/utils/ClassUtils.java
index 6098ff14f..d433c3ec9 100644
--- a/swagger/swagger-generator/generator-core/src/main/java/io/servicecomb/swagger/generator/core/utils/ClassUtils.java
+++ b/swagger/swagger-generator/generator-core/src/main/java/io/servicecomb/swagger/generator/core/utils/ClassUtils.java
@@ -133,13 +133,15 @@ private ClassUtils() {
     ClassConfig classConfig = new ClassConfig();
     classConfig.setClassName(clsName);
 
-    for (Entry<String, Property> entry : properties.entrySet()) {
-      JavaType propertyJavaType =
-          ConverterMgr.findJavaType(classLoader,
-              packageName,
-              swagger,
-              entry.getValue());
-      classConfig.addField(entry.getKey(), propertyJavaType);
+    if (null != properties) {
+      for (Entry<String, Property> entry : properties.entrySet()) {
+        JavaType propertyJavaType =
+            ConverterMgr.findJavaType(classLoader,
+                packageName,
+                swagger,
+                entry.getValue());
+        classConfig.addField(entry.getKey(), propertyJavaType);
+      }
     }
 
     cls = JavassistUtils.createClass(classLoader, classConfig);
diff --git a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestClassUtils.java b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestClassUtils.java
index d78fa9f94..567c5d16a 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestClassUtils.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestClassUtils.java
@@ -17,23 +17,32 @@
 
 package io.servicecomb.swagger.generator.core;
 
+import static junit.framework.TestCase.fail;
 import static org.hamcrest.core.Is.is;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.ws.rs.Path;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.mockito.Mockito;
 
+import io.servicecomb.common.javassist.JavassistUtils;
 import io.servicecomb.swagger.generator.core.schema.User;
 import io.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils;
 import io.servicecomb.swagger.generator.core.utils.ClassUtils;
 import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.models.Swagger;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import mockit.Deencapsulation;
 
 @SwaggerDefinition
 public class TestClassUtils {
@@ -160,4 +169,39 @@ public void testCorrectClassNameEmptyPart() {
     String result = ClassUtils.correctClassName("..a..a..");
     Assert.assertThat(result, is("_._.a._.a._._"));
   }
+
+  @Test
+  public void testGetOrCreateClass() {
+    String className = this.getClass().getCanonicalName();
+
+    Class<?> result = ClassUtils.getOrCreateClass(null, "", new Swagger(), null, className);
+
+    Assert.assertEquals(this.getClass(), result);
+  }
+
+  @Test
+  public void testGetOrCreateClassOnPropertyIsNull() {
+    ClassLoader classLoader = Mockito.mock(ClassLoader.class);
+    String className = this.getClass().getCanonicalName();
+    ClassPool classPool = Mockito.mock(ClassPool.class);
+    CtClass ctClass = Mockito.mock(CtClass.class);
+
+    Map<ClassLoader, ClassPool> classPoolMap = Deencapsulation.getField(JavassistUtils.class, "CLASSPOOLS");
+    classPoolMap.put(classLoader, classPool);
+
+    try {
+      Mockito.when(classLoader.loadClass(className)).thenReturn(null);
+    } catch (ClassNotFoundException e) {
+      fail("unexpected exception: " + e);
+    }
+    Mockito.when(classPool.getOrNull(className)).thenReturn(ctClass);
+    try {
+      Mockito.when(ctClass.toClass(classLoader, null)).thenReturn(this.getClass());
+    } catch (CannotCompileException e) {
+      fail("unexpected exception: " + e);
+    }
+
+    Class<?> result = ClassUtils.getOrCreateClass(classLoader, "", new Swagger(), null, className);
+    Assert.assertEquals(this.getClass(), result);
+  }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services