Replace TODO with GH Issue #3

qaware · Nov 30, 2020 · 2faed51 · 2faed51
1 parent 8428d1d
commit 2faed51
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/.../common/operation/parameter/customizer/DefaultOperationParameterDeprecatedCustomizer.java b/.../common/operation/parameter/customizer/DefaultOperationParameterDeprecatedCustomizer.java
@@ -25,7 +25,6 @@
 public class DefaultOperationParameterDeprecatedCustomizer implements OperationParameterCustomizer {
     @Override
     public void customize(de.qaware.openapigeneratorforspring.model.parameter.Parameter parameter, OperationParameterCustomizerContext context) {
-        // TODO combine with other places where @Deprecated is checked?
         context.getHandlerMethodParameter()
                 .map(HasAnnotationsSupplier::getAnnotationsSupplier)
                 .flatMap(annotationsSupplier -> annotationsSupplier.findAnnotations(Deprecated.class).findFirst())

diff --git a/...ng/common/operation/parameter/customizer/DefaultOperationParameterNullableCustomizer.java b/...ng/common/operation/parameter/customizer/DefaultOperationParameterNullableCustomizer.java
@@ -28,19 +28,15 @@
 public class DefaultOperationParameterNullableCustomizer implements OperationParameterCustomizer {
     @Override
     public void customize(de.qaware.openapigeneratorforspring.model.parameter.Parameter parameter, OperationParameterCustomizerContext context) {
-        context.getHandlerMethodParameter().ifPresent(handlerMethodParameter -> {
-            // TODO support more @Nullable / @NotNull annotations? combine with other places where @Nullable is checked?
-            handlerMethodParameter.getAnnotationsSupplier()
-                    .findAnnotations(Nullable.class).findFirst().ifPresent(ignored -> {
-                Boolean required = parameter.getRequired();
-                if (required != null && required) {
-                    LOGGER.warn("{} in {} marked as required but annotated as @Nullable. Ignoring annotation.",
-                            parameter, context.getOperationInfo());
-                } else {
-                    // TODO is this always right to explicitly set it to false?
-                    parameter.setRequired(false);
-                }
-            });
+        context.getHandlerMethodParameter().flatMap(handlerMethodParameter -> handlerMethodParameter.getAnnotationsSupplier()
+                .findAnnotations(Nullable.class).findFirst()).ifPresent(ignored -> {
+            if (Boolean.TRUE.equals(parameter.getRequired())) {
+                LOGGER.warn("{} in {} marked as required but annotated as @Nullable. Ignoring annotation.",
+                        parameter, context.getOperationInfo());
+            } else {
+                // TODO is this always right to explicitly set it to false?
+                parameter.setRequired(false);
+            }
         });
     }
 }
diff --git a/...aware/openapigeneratorforspring/common/schema/customizer/SchemaCustomizerForNullable.java b/...aware/openapigeneratorforspring/common/schema/customizer/SchemaCustomizerForNullable.java
@@ -29,7 +29,6 @@
 public class SchemaCustomizerForNullable implements SchemaCustomizer {
     @Override
     public void customize(Schema schema, JavaType javaType, AnnotationsSupplier annotationsSupplier) {
-        // TODO support more @Nullable annotations?
         annotationsSupplier.findAnnotations(Nullable.class)
                 .findFirst().ifPresent(ignored -> schema.setNullable(true));
     }