FINERACT-1221 Fix Client SDK Broken Methods

openMF · Oct 12, 2024 · a5f1dc1 · a5f1dc1
1 parent 25866ed
commit a5f1dc1
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 15 deletions.
diff --git a/...act-client/src/test/java/org/apache/fineract/client/test/FineractClientTechnicalTest.java b/...act-client/src/test/java/org/apache/fineract/client/test/FineractClientTechnicalTest.java
@@ -22,7 +22,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.fineract.client.util.FineractClient;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -34,10 +33,9 @@
 public class FineractClientTechnicalTest {
 
     @Test
-    @Disabled("remove Ignore once https://issues.apache.org/jira/browse/FINERACT-1221 is fixed")
     void testInvalidOperations() {
         FineractClient.Builder builder = FineractClient.builder().baseURL("http://test/").tenant("default").basicAuth("mifos", "password");
-        builder.getRetrofitBuilder().validateEagerly(true); // see FINERACT-1221
+        builder.getRetrofitBuilder().validateEagerly(true);
         builder.build();
     }
 

diff --git a/...n/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResource.java b/...n/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResource.java
@@ -136,7 +136,6 @@ public String updateDelinquencyRange(
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Update Delinquency Range based on the Id", description = "")
-    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyRangeRequest.class)))
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.DeleteDelinquencyRangeResponse.class))) })
     public String deleteDelinquencyRange(
@@ -219,7 +218,6 @@ public String updateDelinquencyBucket(
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete Delinquency Bucket based on the Id", description = "")
-    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.PostDelinquencyBucketRequest.class)))
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = DelinquencyApiResourceSwagger.DeleteDelinquencyBucketResponse.class))) })
     public String deleteDelinquencyBucket(

diff --git a/.../org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java b/.../org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java
@@ -125,7 +125,7 @@ public String createEntityDatatableCheck(@Parameter(hidden = true) final String
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = EntityDatatableChecksApiResourceSwagger.DeleteEntityDatatableChecksTemplateResponse.class))) })
     public String deleteDatatable(
             @PathParam("entityDatatableCheckId") @Parameter(description = "entityDatatableCheckId") final long entityDatatableCheckId,
-            final String apiRequestBodyAsJson) {
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder()
                 .deleteEntityDatatableChecks(entityDatatableCheckId, apiRequestBodyAsJson).build();

diff --git a/.../org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResource.java b/.../org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResource.java
@@ -111,7 +111,6 @@ public String updateReportMailingJob(@PathParam("entityId") @Parameter(descripti
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete a Report Mailing Job", description = "")
-    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.DeleteReportMailingJobsRequest.class)))
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.DeleteReportMailingJobsResponse.class))) })
     public String deleteReportMailingJob(@PathParam("entityId") @Parameter(description = "entityId") final Long entityId,

diff --git a/...t-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java b/...t-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java
@@ -213,7 +213,6 @@ public String update(@Parameter(description = "clientId") @PathParam("clientId")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete a Client", description = "If a client is in Pending state, you are allowed to Delete it. The delete is a 'hard delete' and cannot be recovered from. Once clients become active or have loans or savings associated with them, you cannot delete the client but you may Close the client if they have left the program.")
-    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.DeleteClientsClientIdRequest.class)))
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.DeleteClientsClientIdResponse.class))) })
     public String delete(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId) {
@@ -412,7 +411,6 @@ public String applyCommand(@PathParam("externalId") @Parameter(description = "ex
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete a Client", description = "If a client is in Pending state, you are allowed to Delete it. The delete is a 'hard delete' and cannot be recovered from. Once clients become active or have loans or savings associated with them, you cannot delete the client but you may Close the client if they have left the program.")
-    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.DeleteClientsClientIdRequest.class)))
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientsApiResourceSwagger.DeleteClientsClientIdResponse.class))) })
     public String delete(@PathParam("externalId") @Parameter(description = "externalId") final String externalId) {

diff --git a/fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm b/fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm
@@ -6489,9 +6489,6 @@ <h4>Delete a Client</h4>
 					<code class="method-request">
 DELETE clients/3
 Content-Type: application/json
-Request Body:
-{
-}
 					</code>
 					<code class="method-response">
 {
@@ -38958,9 +38955,6 @@ <h4>Delete a Report Mailing Job</h4>
 					<code class="method-request">
 DELETE reportmailingjobs/1
 Content-Type: application/json
-Request Body:
-{
-}
 					</code>
 					<code class="method-response">
 {