test(components): add test for component filter

Add test cases for filtering components with more than 1 field.

Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>

Author: GMishx

rest/resource-server/src/docs/asciidoc/components.adoc

@@ -122,6 +122,26 @@ include::{snippets}/should_document_get_components_by_name/http-response.adoc[]
 include::{snippets}/should_document_get_components_by_name/links.adoc[]
 
 
+[[resources-components-list-by-type-and-createdon]]
+==== Filtering with more fields
+
+A `GET` request to fetch filtered list of service components.
+
+Note : send query parameter's value in encoded format. (Reference: `https://datatracker.ietf.org/doc/html/rfc3986`)
+
+===== Response structure
+include::{snippets}/should_document_get_components_by_type_and_created_on/response-fields.adoc[]
+
+===== Example request
+include::{snippets}/should_document_get_components_by_type_and_created_on/curl-request.adoc[]
+
+===== Example response
+include::{snippets}/should_document_get_components_by_type_and_created_on/http-response.adoc[]
+
+===== Links
+include::{snippets}/should_document_get_components_by_type_and_created_on/links.adoc[]
+
+
 [[resources-components-list-by-type]]
 ==== Listing by type
 

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java

@@ -12,6 +12,7 @@
 
 package org.eclipse.sw360.rest.resourceserver.component;
 
+import com.google.common.collect.Sets;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
@@ -1163,9 +1164,7 @@ public ResponseEntity<RequestStatus> splitComponents(
                         && !fieldValue.toString().equalsIgnoreCase(filterSet.iterator().next())) {
                     return false;
                 } else if (fieldValue instanceof Set) {
-                    Set<String> fieldValueSet = (Set<String>) fieldValue;
-                    fieldValueSet.retainAll(filterSet);
-                    if (fieldValueSet.isEmpty()) {
+                    if (Sets.intersection(filterSet, (Set<String>) fieldValue).isEmpty()) {
                         return false;
                     }
                 }

rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ComponentSpecTest.java

@@ -911,6 +911,47 @@ public void should_document_get_components_by_name() throws Exception {
                         )));
     }
 
+    @Test
+    public void should_document_get_components_by_type_and_created_on() throws Exception {
+        mockMvc.perform(get("/api/components")
+                        .header("Authorization", TestHelper.generateAuthHeader(testUserId, testUserPassword))
+                        .queryParam("componentType", angularComponent.getComponentType().toString())
+                        .queryParam("createdOn", angularComponent.getCreatedOn())
+                        .queryParam("categories", "javascript, sql")
+                        .queryParam("luceneSearch", "false")
+                        .queryParam("page", "0")
+                        .queryParam("page_entries", "5")
+                        .queryParam("sort", "name,desc")
+                        .accept(MediaTypes.HAL_JSON))
+                .andExpect(status().isOk())
+                .andDo(this.documentationHandler.document(
+                        queryParameters(
+                                parameterWithName("componentType").description("Filter for type"),
+                                parameterWithName("createdOn").description("Filter for component creation date"),
+                                parameterWithName("categories").description("Filter for categories"),
+                                parameterWithName("luceneSearch").description("Filter with exact match or lucene match."),
+                                parameterWithName("page").description("Page of components"),
+                                parameterWithName("page_entries").description("Amount of components per page"),
+                                parameterWithName("sort").description("Defines order of the components")
+                        ),
+                        links(
+                                linkWithRel("curies").description("Curies are used for online documentation"),
+                                linkWithRel("first").description("Link to first page"),
+                                linkWithRel("last").description("Link to last page")
+                        ),
+                        responseFields(
+                                subsectionWithPath("_embedded.sw360:components.[]name").description("The name of the component"),
+                                subsectionWithPath("_embedded.sw360:components.[]componentType").description("The component type, possible values are: " + Arrays.asList(ComponentType.values())),
+                                subsectionWithPath("_embedded.sw360:components").description("An array of <<resources-components, Components resources>>"),
+                                subsectionWithPath("_links").description("<<resources-index-links,Links>> to other resources"),
+                                fieldWithPath("page").description("Additional paging information"),
+                                fieldWithPath("page.size").description("Number of components per page"),
+                                fieldWithPath("page.totalElements").description("Total number of all existing components"),
+                                fieldWithPath("page.totalPages").description("Total number of pages"),
+                                fieldWithPath("page.number").description("Number of the current page")
+                        )));
+    }
+
     @Test
     public void should_document_update_component() throws Exception {
         ComponentDTO updateComponent = new ComponentDTO();