fix: guard nullpointer exception with if statement

springwolf · May 3, 2024 · 060a016 · 060a016
1 parent 9e7a4be
commit 060a016
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...f-core/src/main/java/io/github/springwolf/core/asyncapi/components/ComponentsService.java b/...f-core/src/main/java/io/github/springwolf/core/asyncapi/components/ComponentsService.java
@@ -5,13 +5,15 @@
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
 import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
 import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import jakarta.annotation.Nullable;
 
 import java.util.Map;
 
 public interface ComponentsService {
 
     Map<String, SchemaObject> getSchemas();
 
+    @Nullable
     SchemaObject resolveSchema(String schemaName);
 
     String registerSchema(SchemaObject headers);

diff --git a/...src/main/java/io/github/springwolf/core/asyncapi/components/DefaultComponentsService.java b/...src/main/java/io/github/springwolf/core/asyncapi/components/DefaultComponentsService.java
@@ -14,12 +14,10 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
-import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -62,7 +60,6 @@ public Map<String, SchemaObject> getSchemas() {
     }
 
     @Override
-    @Nullable
     public SchemaObject resolveSchema(String schemaName) {
         if (schemas.containsKey(schemaName)) {
             return swaggerSchemaUtil.mapSchema(schemas.get(schemaName));
@@ -126,13 +123,13 @@ private String getSchemaName(Class<?> type, Map<String, Schema> schemas) {
         }
 
         if (schemas.size() == 1) {
-            return new ArrayList<>(schemas.keySet()).get(0);
+            return schemas.keySet().stream().findFirst().get();
         }
 
         Set<String> resolvedPayloadModelName =
                 runWithFqnSetting((unused) -> converter.read(type).keySet());
         if (!resolvedPayloadModelName.isEmpty()) {
-            return new ArrayList<>(resolvedPayloadModelName).get(0);
+            return resolvedPayloadModelName.stream().findFirst().get();
         }
 
         return getNameFromClass(type);

diff --git a/.../main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadService.java b/.../main/java/io/github/springwolf/core/asyncapi/scanners/common/payload/PayloadService.java
@@ -54,7 +54,9 @@ private NamedSchemaObject buildSchema(String contentType, Class<?> payloadType)
         String componentsSchemaName = this.componentsService.registerSchema(payloadType, contentType);
 
         SchemaObject schema = componentsService.resolveSchema(componentsSchemaName);
-        schema.setTitle(payloadType.getSimpleName());
+        if (schema != null) {
+            schema.setTitle(payloadType.getSimpleName());
+        }
 
         return new NamedSchemaObject(componentsSchemaName, schema);
     }