Skip to content

Commit 927da5a

Browse files
keerthi-blGMishx
authored andcommitted
feat(rest) : Search for vendors added.
Signed-off-by: Keerthi B L <[email protected]>
1 parent 45a53b4 commit 927da5a

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/Sw360VendorService.java

+9
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ public List<Vendor> getVendors() {
4949
}
5050
}
5151

52+
public List<Vendor> searchVendors(String searchText) {
53+
try {
54+
VendorService.Iface sw360VendorClient = getThriftVendorClient();
55+
return sw360VendorClient.searchVendors(searchText);
56+
} catch (TException e) {
57+
throw new RuntimeException(e);
58+
}
59+
}
60+
5261
public Vendor getVendorById(String vendorId) {
5362
try {
5463
VendorService.Iface sw360VendorClient = getThriftVendorClient();

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorController.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import java.util.List;
5555
import jakarta.servlet.http.HttpServletResponse;
5656

57+
import static com.google.common.base.Strings.isNullOrEmpty;
5758
import static org.eclipse.sw360.datahandler.common.SW360Constants.CONTENT_TYPE_OPENXML_SPREADSHEET;
5859
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
5960

@@ -78,10 +79,17 @@ public class VendorController implements RepresentationModelProcessor<Repository
7879
)
7980
@RequestMapping(value = VENDORS_URL, method = RequestMethod.GET)
8081
public ResponseEntity<CollectionModel<EntityModel<Vendor>>> getVendors(
82+
@Parameter(description = "Search text")
83+
@RequestParam(value = "searchText", required = false) String searchText,
8184
Pageable pageable,
8285
HttpServletRequest request
8386
) throws TException, URISyntaxException, PaginationParameterException, ResourceClassNotFoundException {
84-
List<Vendor> vendors = vendorService.getVendors();
87+
List<Vendor> vendors = null;
88+
if (!isNullOrEmpty(searchText)) {
89+
vendors = vendorService.searchVendors(searchText);
90+
} else {
91+
vendors = vendorService.getVendors();
92+
}
8593

8694
PaginationResult<Vendor> paginationResult = restControllerHelper.createPaginationResult(request, pageable, vendors, SW360Constants.TYPE_VENDOR);
8795
List<EntityModel<Vendor>> vendorResources = new ArrayList<>();

0 commit comments

Comments
 (0)