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

Fix remove certificate API

See merge request entgra/carbon-device-mgt!855

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java

@@ -310,8 +310,6 @@ public interface CertificateManagementAdminService {
             @HeaderParam("If-Modified-Since") String ifModifiedSince);
 
     @DELETE
-    @Path("/{serialNumber}")
-    @Consumes(MediaType.WILDCARD)
     @ApiOperation(
             consumes = MediaType.WILDCARD,
             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.",
                     required = true,
                     defaultValue = "12438035315552875930")
-            @PathParam("serialNumber") String serialNumber);
+            @QueryParam("serialNumber") String serialNumber);
 
     /**
      * Verify Certificate for the API security filter

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java

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