This is an automated email from the ASF dual-hosted git repository.
hezhangjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 309a9bc55 fix bug JsonPropertyIntrospector处理record类型里的枚举值时，会报空指针异常
#4983 (#5012)
309a9bc55 is described below
commit 309a9bc55ba99cf1b5affeead5c591029e329f97
Author: Caimo <[email protected]>
AuthorDate: Mon Dec 1 11:16:00 2025 +0800
fix bug JsonPropertyIntrospector处理record类型里的枚举值时，会报空指针异常 #4983 (#5012)
Co-authored-by: QIURC <[email protected]>
---
.../introspector/JsonPropertyIntrospector.java | 6 ++--
.../swagger/generator/core/TestSwaggerUtils.java | 34 ++++++++++++++++++++--
.../swagger/generator/core/pojo/TestTypeClass.java | 34 ++++++++++++++++++++++
.../generator/core/pojo/TestTypeEnumLang.java | 22 ++++++++++++++
.../generator/core/pojo/TestTypeRecord.java | 25 ++++++++++++++++
5 files changed, 117 insertions(+), 4 deletions(-)
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java
index bf647c15b..4e377b81a 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java
@@ -26,6 +26,8 @@ import com.fasterxml.jackson.databind.introspect.Annotated;
import io.swagger.v3.core.jackson.SwaggerAnnotationIntrospector;
+import java.util.Objects;
+
public class JsonPropertyIntrospector extends SwaggerAnnotationIntrospector {
private static final long serialVersionUID = 4157263023893695762L;
@@ -47,10 +49,10 @@ public class JsonPropertyIntrospector extends
SwaggerAnnotationIntrospector {
@Override
public String findPropertyDescription(Annotated annotated) {
Class<?> enumClass = annotated.getRawType();
- if (enumClass.isEnum()) {
+ if (enumClass.isEnum() && Objects.nonNull(annotated.getAnnotated())) {
return SwaggerEnum.JDK.findPropertyDescription(enumClass,
annotated.getAnnotated().getAnnotations());
}
- if (EnumUtils.isDynamicEnum(enumClass)) {
+ if (EnumUtils.isDynamicEnum(enumClass) &&
Objects.nonNull(annotated.getAnnotated())) {
return SwaggerEnum.DYNAMIC.findPropertyDescription(enumClass,
annotated.getAnnotated().getAnnotations());
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
index 6a138dc42..7611a3f80 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestSwaggerUtils.java
@@ -28,11 +28,14 @@ import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
import org.apache.servicecomb.foundation.common.utils.ReflectUtils;
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
import org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils;
+import org.apache.servicecomb.swagger.generator.core.pojo.TestTypeClass;
+import org.apache.servicecomb.swagger.generator.core.pojo.TestTypeRecord;
import org.apache.servicecomb.swagger.generator.core.pojo.TestType1;
import org.apache.servicecomb.swagger.generator.core.pojo.TestType2;
import org.apache.servicecomb.swagger.generator.core.schema.RepeatOperation;
@@ -50,6 +53,7 @@ import io.swagger.v3.oas.models.parameters.RequestBody;
@SuppressWarnings("rawtypes")
public class TestSwaggerUtils {
+ Logger LOGGER = Logger.getLogger(TestSwaggerUtils.class.getName());
@Test
public void testSchemaMethod() {
@@ -117,12 +121,24 @@ public class TestSwaggerUtils {
Map<String, TestType2> t3;
TestType2[] t4;
+
+ }
+
+ private static class AllTypeTest3{
+ TestTypeRecord t5;
+ }
+ private static class AllTypeTest4{
+ TestTypeClass t5;
}
@Test
public void testAddDefinitions() {
- Field[] fields1 = AllTypeTest1.class.getDeclaredFields();
- Field[] fields2 = AllTypeTest2.class.getDeclaredFields();
+ testAllType(AllTypeTest1.class, AllTypeTest2.class);
+ }
+
+ private void testAllType(Class clazz1, Class clazz2) {
+ Field[] fields1 = clazz1.getDeclaredFields();
+ Field[] fields2 = clazz2.getDeclaredFields();
for (Field value : fields1) {
for (Field field : fields2) {
if (value.isSynthetic() || field.isSynthetic()) {
@@ -132,12 +148,18 @@ public class TestSwaggerUtils {
testExcep(value.getGenericType(), field.getGenericType());
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException e) {
+ LOGGER.warning(value.getGenericType() + " " + field.getGenericType()
+ " " + e.getMessage());
MatcherAssert.assertThat(e.getMessage(), containsString("duplicate
param model:"));
}
}
}
}
+ @Test
+ public void testAddDefinitionsWithRecord() {
+ testAllType(AllTypeTest3.class, AllTypeTest4.class);
+ }
+
private void testExcep(Type f1, Type f2) {
OpenAPI swagger = new OpenAPI();
SwaggerUtils.resolveTypeSchemas(swagger, f1);
@@ -161,5 +183,13 @@ public class TestSwaggerUtils {
// should be ObjectSchema but swagger is not.
// <pre> Assertions.assertTrue(schema instanceof ObjectSchema) </pre>
Assertions.assertEquals("object", schema.getType());
+
+ openAPI = new OpenAPI();
+ schema = SwaggerUtils.getSchema(openAPI,
SwaggerUtils.resolveTypeSchemas(openAPI, TestTypeClass.class)); // resolve
reference
+ Assertions.assertEquals("object", schema.getType());
+
+ openAPI = new OpenAPI();
+ schema = SwaggerUtils.getSchema(openAPI,
SwaggerUtils.resolveTypeSchemas(openAPI, TestTypeRecord.class)); // resolve
reference
+ Assertions.assertEquals("object", schema.getType());
}
}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeClass.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeClass.java
new file mode 100644
index 000000000..b00a44334
--- /dev/null
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeClass.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.servicecomb.swagger.generator.core.pojo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "YYY")
+public class TestTypeClass {
+ @Schema(description = "language")
+ private TestTypeEnumLang testTypeEnumLang;
+
+ public TestTypeEnumLang getTestTypeEnumLang() {
+ return testTypeEnumLang;
+ }
+
+ public void setTestTypeEnumLang(TestTypeEnumLang testTypeEnumLang) {
+ this.testTypeEnumLang = testTypeEnumLang;
+ }
+}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeEnumLang.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeEnumLang.java
new file mode 100644
index 000000000..515f45c7b
--- /dev/null
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeEnumLang.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.servicecomb.swagger.generator.core.pojo;
+
+public enum TestTypeEnumLang {
+ JAVA, CHINESE, UNKNOWN;
+}
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeRecord.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeRecord.java
new file mode 100644
index 000000000..c61cc0913
--- /dev/null
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/pojo/TestTypeRecord.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.servicecomb.swagger.generator.core.pojo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "YYY")
+public record TestTypeRecord(
+ @Schema(description = "language") TestTypeEnumLang testTypeEnumLang) {
+}
