Merge pull request #3175 from alesavin/master

AnnotationsUtils: API response header can be processed with only name…

Author: frantuma

modules/swagger-core/src/main/java/io/swagger/v3/core/util/AnnotationsUtils.java

@@ -895,7 +895,7 @@ public static Optional<Header> getHeader(io.swagger.v3.oas.annotations.headers.H
         }
 
         Header headerObject = new Header();
-        boolean isEmpty = true;
+        boolean isEmpty = !StringUtils.isNotBlank(header.name());
         if (StringUtils.isNotBlank(header.description())) {
             headerObject.setDescription(header.description());
             isEmpty = false;

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/AnnotationsUtilsHeadersTest.java

@@ -0,0 +1,86 @@
+package io.swagger.v3.core.resolving;
+
+import com.google.common.collect.ImmutableMap;
+import io.swagger.v3.core.util.AnnotationsUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.headers.Header;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.models.headers.Header.StyleEnum;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+
+public class AnnotationsUtilsHeadersTest {
+
+    private io.swagger.v3.oas.models.headers.Header header() {
+        return new io.swagger.v3.oas.models.headers.Header().style(StyleEnum.SIMPLE);
+    }
+
+    @DataProvider
+    private Object[][] expectedData() {
+        return new Object[][]{
+                {"methodOne", Optional.empty()},
+                {"methodTwo", Optional.empty()},
+                {"methodThree", Optional.empty()},
+                {"methodFour", Optional.of(ImmutableMap.of(
+                        "", header().description("header"),
+                        "header1", header(),
+                        "header2", header().description("header 2"),
+                        "header3", header().$ref("#/components/schemas/header3")
+                ))},
+        };
+    }
+
+    @Test(dataProvider = "expectedData")
+    public void extensionsTest(String methodName,
+                               Optional<Map<String, io.swagger.v3.oas.models.headers.Header>> expected)
+            throws NoSuchMethodException {
+        final Method method = getClass().getDeclaredMethod(methodName);
+        final Header[] headers =
+                Arrays.stream(method.getAnnotation(Operation.class).responses())
+                        .flatMap(response -> Arrays.stream(response.headers())).toArray(Header[]::new);
+
+        final Optional<Map<String, io.swagger.v3.oas.models.headers.Header>> optionalMap =
+                AnnotationsUtils.getHeaders(headers, null);
+
+        Assert.assertEquals(optionalMap, expected);
+    }
+
+    @Operation(description = "method")
+    private void methodOne() {
+
+    }
+
+    @Operation(description = "method", responses = {
+            @ApiResponse()
+    })
+    private void methodTwo() {
+
+    }
+
+    @Operation(description = "method", responses = {
+            @ApiResponse(headers = {
+                    @Header(name = "")
+            })
+    })
+    private void methodThree() {
+
+    }
+
+    @Operation(description = "method", responses = {
+            @ApiResponse(headers = {
+                    @Header(name = "", description = "header"),
+                    @Header(name = "header1"),
+                    @Header(name = "header2", description = "header 2"),
+                    @Header(name = "header3", ref = "#/components/schemas/header3")
+            })
+    })
+    private void methodFour() {
+
+    }
+}