Merge branch 'certificate-removal-issue-fix' into 'master'

Fix remove certificate API

See merge request entgra/carbon-device-mgt!855
feature/traccar-sync
Pahansith Gunathilake 3 years ago
commit 87808ec9df

@ -310,8 +310,6 @@ public interface CertificateManagementAdminService {
@HeaderParam("If-Modified-Since") String ifModifiedSince); @HeaderParam("If-Modified-Since") String ifModifiedSince);
@DELETE @DELETE
@Path("/{serialNumber}")
@Consumes(MediaType.WILDCARD)
@ApiOperation( @ApiOperation(
consumes = MediaType.WILDCARD, consumes = MediaType.WILDCARD,
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
@ -348,7 +346,7 @@ public interface CertificateManagementAdminService {
"NOTE: Make sure that a certificate with the serial number you provide exists in the server. If not, first add a certificate.", "NOTE: Make sure that a certificate with the serial number you provide exists in the server. If not, first add a certificate.",
required = true, required = true,
defaultValue = "12438035315552875930") defaultValue = "12438035315552875930")
@PathParam("serialNumber") String serialNumber); @QueryParam("serialNumber") String serialNumber);
/** /**
* Verify Certificate for the API security filter * Verify Certificate for the API security filter

@ -151,9 +151,7 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
} }
@DELETE @DELETE
@Path("/{serialNumber}") public Response removeCertificate(@QueryParam("serialNumber") String serialNumber) {
@Consumes(MediaType.WILDCARD)
public Response removeCertificate(@PathParam("serialNumber") String serialNumber) {
RequestValidationUtil.validateSerialNumber(serialNumber); RequestValidationUtil.validateSerialNumber(serialNumber);
CertificateManagementService certificateService = CertificateMgtAPIUtils.getCertificateManagementService(); CertificateManagementService certificateService = CertificateMgtAPIUtils.getCertificateManagementService();

Loading…
Cancel
Save