Skip to content

Commit 114b276

Browse files
committed
feat(rest) : BulkReleaseEdit end points
Signed-off-by: Keerthi B L <[email protected]>
1 parent 31bef0c commit 114b276

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1260,14 +1260,14 @@ public ResponseEntity writeSpdxLicenseInfoIntoRelease(
12601260
Set<String> otherLicenseIds = licensesInfoInRequestBody.get("otherLicenseIds");
12611261

12621262
if (!CommonUtils.isNullOrEmptyCollection(licenseIds)) {
1263-
sw360Release.getMainLicenseIds().clear();
1263+
sw360Release.getMainLicenseIds().clear();
12641264
for (String licenseId : licenseIds) {
12651265
sw360Release.addToMainLicenseIds(licenseId);
12661266
}
12671267
}
12681268

12691269
if (!CommonUtils.isNullOrEmptyCollection(otherLicenseIds)) {
1270-
sw360Release.getOtherLicenseIds().clear();
1270+
sw360Release.getOtherLicenseIds().clear();
12711271
for (String licenseId : otherLicenseIds) {
12721272
sw360Release.addToOtherLicenseIds(licenseId);
12731273
}
@@ -1747,4 +1747,4 @@ private Release setBackwardCompatibleFieldsInRelease(Map<String, Object> reqBody
17471747

17481748
return release;
17491749
}
1750-
}
1750+
}

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

+9
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ public List<Vendor> getVendors() {
4747
}
4848
}
4949

50+
public List<Vendor> searchVendors(String searchText) {
51+
try {
52+
VendorService.Iface sw360VendorClient = getThriftVendorClient();
53+
return sw360VendorClient.searchVendors(searchText);
54+
} catch (TException e) {
55+
throw new RuntimeException(e);
56+
}
57+
}
58+
5059
public Vendor getVendorById(String vendorId) {
5160
try {
5261
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)