sonar correct/ignore

altro3 · Nov 16, 2022 · e37660b · e37660b
1 parent 8738541
commit e37660b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java
@@ -1929,6 +1929,7 @@ private Schema getSchemaDefinition(
         return null;
     }
 
+    @SuppressWarnings("java:S3655") // false positive
     private void readAllInterfaces(OpenAPI openAPI, VisitorContext context, @Nullable Element definingElement, List<MediaType> mediaTypes,
                                    Schema schema, ClassElement superType, Map<String, Schema> schemas, Map<String, ClassElement> superTypeArgs) {
         String parentSchemaName = computeDefaultSchemaName(definingElement, superType, superTypeArgs, context);
@@ -1978,6 +1979,7 @@ private void readAllInterfaces(OpenAPI openAPI, VisitorContext context, @Nullabl
      *
      * @throws JsonProcessingException when Json parsing fails
      */
+    @SuppressWarnings("java:S3776")
     protected Schema readSchema(AnnotationValue<io.swagger.v3.oas.annotations.media.Schema> schemaValue, OpenAPI openAPI, VisitorContext context, @Nullable Element type, Map<String, ClassElement> typeArgs, List<MediaType> mediaTypes) throws JsonProcessingException {
         Map<CharSequence, Object> values = schemaValue.getValues()
             .entrySet()
@@ -2205,6 +2207,7 @@ private void populateSchemaProperties(OpenAPI openAPI, VisitorContext context, E
         }
     }
 
+    @SuppressWarnings("java:S3776")
     private void processPropertyElements(OpenAPI openAPI, VisitorContext context, Element type, Map<String, ClassElement> typeArgs, Schema schema, List<? extends TypedElement> publicFields, List<MediaType> mediaTypes, JavadocDescription classJavadoc) {
 
         ClassElement classElement = null;

diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java
@@ -293,10 +293,12 @@ public static ClassElement getCustomSchema(String className, Map<String, ClassEl
 
         // third read environments properties
         Environment environment = getEnv(context);
-        for (Map.Entry<String, Object> entry : environment.getProperties(MICRONAUT_OPENAPI_SCHEMA, StringConvention.RAW).entrySet()) {
-            String configuredClassName = entry.getKey();
-            String targetClassName = (String) entry.getValue();
-            readCustomSchema(configuredClassName, targetClassName, customSchemas, context);
+        if (environment != null) {
+            for (Map.Entry<String, Object> entry : environment.getProperties(MICRONAUT_OPENAPI_SCHEMA, StringConvention.RAW).entrySet()) {
+                String configuredClassName = entry.getKey();
+                String targetClassName = (String) entry.getValue();
+                readCustomSchema(configuredClassName, targetClassName, customSchemas, context);
+            }
         }
 
         context.put(MICRONAUT_CUSTOM_SCHEMAS, customSchemas);