diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/controller/PartnerServiceController.java b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/controller/PartnerServiceController.java index cebcd3ba1b..5854f78779 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/controller/PartnerServiceController.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/controller/PartnerServiceController.java @@ -266,17 +266,9 @@ public ResponseEntity> retrieveP return new ResponseEntity<>(response, HttpStatus.OK); } - /* - * This endpoint has been deprecated since the release-1.3.x - * It has been replaced by the new GET /partners/policy-requests endpoint. - * The functionality provided by this API is now available in the new endpoint. - * Please use the new endpoint for all future requests. - */ - @Deprecated(since = "release-1.3.x") @PreAuthorize("hasAnyRole(@authorizedRoles.getGetpartnersapikeyrequest())") @RequestMapping(value = "/{partnerId}/apikey/request", method = RequestMethod.GET) - @Operation(summary = "Service to get API key requests of partner - deprecated since release-1.3.x.", - description = "This endpoint has been deprecated since the release-1.3.x and replaced by the GET /partners/policy-requests endpoint.") + @Operation(summary = "Service to get API key requests of partner") public ResponseEntity>> getAPIKeyRequestsOfPartner( @PathVariable String partnerId) { ResponseWrapper> response = new ResponseWrapper<>(); @@ -331,17 +323,9 @@ public ResponseWrapper uploadPartnerCertificate( return response; } - /* - * This endpoint has been deprecated since the release-1.3.x - * It has been replaced by the new GET /partners/{partnerId}/certificate-data endpoint. - * The functionality provided by this API is now available in the new endpoint. - * Please use the new endpoint for all future requests. - */ - @Deprecated(since = "release-1.3.x") @PreAuthorize("hasAnyRole(@authorizedRoles.getGetpartnerscertificate())") @RequestMapping(value = "/{partnerId}/certificate", method = RequestMethod.GET) - @Operation(summary = "Service to get partner certificate - deprecated since release-1.3.x.", - description = "This endpoint has been deprecated since the release-1.3.x and replaced by the GET /partners/{partnerId}/certificate-data endpoint.") + @Operation(summary = "Service to get partner certificate") public ResponseWrapper getPartnerCertificate( @ApiParam("To download resigned partner certificate.") @PathVariable("partnerId") @NotNull String partnerId) throws JsonParseException, JsonMappingException, JsonProcessingException, IOException { ResponseWrapper response = new ResponseWrapper<>(); diff --git a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/manager/controller/PartnerManagementController.java b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/manager/controller/PartnerManagementController.java index 7c20248605..fbe523e207 100644 --- a/partner/partner-management-service/src/main/java/io/mosip/pms/partner/manager/controller/PartnerManagementController.java +++ b/partner/partner-management-service/src/main/java/io/mosip/pms/partner/manager/controller/PartnerManagementController.java @@ -75,7 +75,7 @@ public class PartnerManagementController { /** - * This endpoint would be used by partner Manager, to update Partner api key to Policy Mappings. + * This endpoint would be used by partner Manager, to update Partner API key to Policy Mappings. * @param request this class contain oldPolicyID and newPolicyID * @param partnerId this is unique id created after self registered by partner * @param partnerApiKey this is unique id created by partner manager at the time of approving partner request @@ -83,7 +83,7 @@ public class PartnerManagementController { */ @PreAuthorize("hasAnyRole(@authorizedRoles.getPutpartnersapikeypolicies())") @RequestMapping(value = "/{partnerId}/apikey/{apikey}/policies", method = RequestMethod.PUT) - @Operation(summary = "Service to update policies against to api key", description = "Service to update policies against to api key") + @Operation(summary = "Service to update policies against to API key", description = "Service to update policies against to API key") public ResponseEntity> partnerApiKeyToPolicyMappings( @RequestBody @Valid RequestWrapper request, @PathVariable String partnerId, @@ -183,7 +183,7 @@ public ResponseEntity> getPartnersDeatil */ @PreAuthorize("hasAnyRole(@authorizedRoles.getGetpartnersapikey())") @RequestMapping(value = "/{partnerId}/apikey/{apikey}" , method = RequestMethod.GET) - @Operation(summary = "Service to get policy for given api key", description = "Service to get policy for given api key") + @Operation(summary = "Service to get policy for given API key", description = "Service to get policy for given API key") public ResponseEntity> getPolicyMappedToAPIKey( @PathVariable String partnerId, @PathVariable String apikey){ @@ -199,15 +199,15 @@ public ResponseEntity> ge /* * This endpoint has been deprecated since the release-1.3.x - * It has been replaced by the new GET /partners/apikey/search/v2 endpoint. + * It has been replaced by the new GET /partners/partner-policy-requests endpoint. * The functionality provided by this API is now available in the new endpoint. * Please use the new endpoint for all future requests. */ @Deprecated(since = "release-1.3.x") @PreAuthorize("hasAnyRole(@authorizedRoles.getGetpartnersapikey())") @RequestMapping(value = "/apikey" , method = RequestMethod.GET) - @Operation(summary = "Service to get api key requests - deprecated since release-1.3.x.", - description = "This endpoint has been deprecated since the release-1.3.x and replaced by the GET /partners/apikey/search/v2 endpoint") + @Operation(summary = "Service to get API key requests - deprecated since release-1.3.x.", + description = "This endpoint has been deprecated since the release-1.3.x and replaced by the GET /partners/partner-policy-requests endpoint") public ResponseEntity> getAPIKeyRequests(){ List apikeyRequests = null; ResponseWrapper response = new ResponseWrapper<>(); @@ -227,7 +227,7 @@ public ResponseEntity> getAPIKeyR */ @PreAuthorize("hasAnyRole(@authorizedRoles.getGetpartnersapikey())") @RequestMapping(value = "/apikey/{apikey}" , method = RequestMethod.GET) - @Operation(summary = "Service to get api key request", description = "Service to get api key request") + @Operation(summary = "Service to get API key request", description = "Service to get API key request") public ResponseEntity> getAPIKeyRequest( @PathVariable String apikey) { ResponseWrapper response = new ResponseWrapper<>(); @@ -255,7 +255,7 @@ public ResponseEntity> approveRejectPolicyMappings( @PreAuthorize("hasAnyRole(@authorizedRoles.getPatchpartnerspolicyapikeystatus())") @RequestMapping(value = "/{partnerId}/policy/{policyId}/apiKey/status", method = RequestMethod.PATCH) - @Operation(summary = "Service to activate/de-activate partner api key", description = "Service to activate/de-activate partner api key") + @Operation(summary = "Service to activate/de-activate partner API key", description = "Service to activate/de-activate partner API key") public ResponseEntity> activateDeactivatePartnerAPIKey(@PathVariable String partnerId, @PathVariable String policyId, @RequestBody @Valid RequestWrapper request) { ResponseWrapper response = new ResponseWrapper<>();