Skip to content

chore: Add simpler constructors for ResponseDTO #39338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohanarpit merged 4 commits into from
Feb 20, 2025
Merged

chore: Add simpler constructors for ResponseDTO #39338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bcbf7e
chore: Add simpler constructors for ResponseDTO
sharat87 Feb 18, 2025
8fdc726
fix ambiguity in one call
sharat87 Feb 18, 2025
fa4b630
Merge branch 'release' into chore/simpler-response-api
sharat87 Feb 18, 2025
486a4d0
Merge branch 'release' into chore/simpler-response-api
sharat87 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/main/java/com/appsmith/server/authentication/handlers/ce/LogoutSuccessHandlerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Mono<Void> onLogoutSuccess(WebFilterExchange webFilterExchange, Authentic
ServerHttpResponse response = exchange.getResponse();
response.setStatusCode(HttpStatus.OK);
response.getHeaders().add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
ResponseDTO<Boolean> responseBody = new ResponseDTO<>(HttpStatus.OK.value(), true, null);
ResponseDTO<Boolean> responseBody = new ResponseDTO<>(HttpStatus.OK, true);
String responseStr;
try {
responseStr = objectMapper.writeValueAsString(responseBody);
Expand Down
9 changes: 4 additions & 5 deletions ...smith-server/src/main/java/com/appsmith/server/controllers/ConsolidatedAPIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ public Mono<ResponseDTO<ConsolidatedAPIResponseDTO>> getAllDataForFirstPageLoadF

return consolidatedAPIService
.getConsolidatedInfoForPageLoad(basePageId, baseApplicationId, refType, refName, ApplicationMode.EDIT)
.map(consolidatedAPIResponseDTO ->
new ResponseDTO<>(HttpStatus.OK.value(), consolidatedAPIResponseDTO, null))
.map(consolidatedAPIResponseDTO -> new ResponseDTO<>(HttpStatus.OK, consolidatedAPIResponseDTO))
.tag("pageId", Objects.toString(basePageId))
.tag("applicationId", Objects.toString(baseApplicationId))
.tag("refType", Objects.toString(refType))
Expand Down Expand Up @@ -116,7 +115,7 @@ public Mono<ResponseEntity<ResponseDTO<ConsolidatedAPIResponseDTO>>> getAllDataF
// if defaultPageId and applicationId are both null, then don't compute ETag
if (isBlank(responseHash)) {
ResponseDTO<ConsolidatedAPIResponseDTO> responseDTO =
new ResponseDTO<>(HttpStatus.OK.value(), consolidatedAPIResponseDTO, null);
new ResponseDTO<>(HttpStatus.OK, consolidatedAPIResponseDTO);
return new ResponseEntity<>(responseDTO, HttpStatus.OK);
}

Expand All @@ -126,12 +125,12 @@ public Mono<ResponseEntity<ResponseDTO<ConsolidatedAPIResponseDTO>>> getAllDataF

if (ifNoneMatch != null && ifNoneMatch.equals(responseHash)) {
ResponseDTO<ConsolidatedAPIResponseDTO> responseDTO =
new ResponseDTO<>(HttpStatus.NOT_MODIFIED.value(), null, null);
new ResponseDTO<>(HttpStatus.NOT_MODIFIED, null);
return new ResponseEntity<>(responseDTO, headers, HttpStatus.NOT_MODIFIED);
}

ResponseDTO<ConsolidatedAPIResponseDTO> responseDTO =
new ResponseDTO<>(HttpStatus.OK.value(), consolidatedAPIResponseDTO, null);
new ResponseDTO<>(HttpStatus.OK, consolidatedAPIResponseDTO);

return new ResponseEntity<>(responseDTO, headers, HttpStatus.OK);
})
Expand Down
18 changes: 9 additions & 9 deletions ...server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public Mono<ResponseDTO<ActionCollectionDTO>> create(@Valid @RequestBody ActionC
log.debug("Going to create action collection {}", resource.getClass().getName());
return layoutCollectionService
.createCollection(resource)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}

@JsonView(Views.Public.class)
Expand All @@ -66,7 +66,7 @@ public Mono<ResponseDTO<List<ActionCollectionDTO>>> getAllUnpublishedActionColle
return actionCollectionService
.getPopulatedActionCollectionsByViewMode(params, false)
.collectList()
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}

@JsonView(Views.Public.class)
Expand All @@ -79,7 +79,7 @@ public Mono<ResponseDTO<ActionCollectionDTO>> moveActionCollection(
actionCollectionMoveDTO.getDestinationPageId());
return layoutCollectionService
.moveCollection(actionCollectionMoveDTO)
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK.value(), actionCollection, null));
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK, actionCollection));
}

@JsonView(Views.Public.class)
Expand All @@ -89,7 +89,7 @@ public Mono<ResponseDTO<LayoutDTO>> refactorActionCollectionName(
refactorEntityNameDTO.setEntityType(EntityType.JS_OBJECT);
return refactoringService
.refactorEntityName(refactorEntityNameDTO)
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.OK, created));
}

@JsonView(Views.Public.class)
Expand All @@ -100,7 +100,7 @@ public Mono<ResponseDTO<List<ActionCollectionViewDTO>>> getAllPublishedActionCol
return actionCollectionService
.getActionCollectionsForViewMode(applicationId, null)
.collectList()
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}

@JsonView(Views.Public.class)
Expand All @@ -110,7 +110,7 @@ public Mono<ResponseDTO<ActionCollectionDTO>> updateActionCollection(
log.debug("Going to update action collection with id: {}", id);
return layoutCollectionService
.updateUnpublishedActionCollection(id, resource)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}

@JsonView(Views.Public.class)
Expand All @@ -120,7 +120,7 @@ public Mono<ResponseDTO<Integer>> updateActionCollectionBody(
log.debug("Going to update action collection body with id: {}", id);
return layoutCollectionService
.updateUnpublishedActionCollectionBody(id, resource)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}

@JsonView(Views.Public.class)
Expand All @@ -134,7 +134,7 @@ public Mono<ResponseDTO<LayoutDTO>> refactorActionCollection(
refactorEntityNameDTO.setEntityType(EntityType.JS_ACTION);
return refactoringService
.refactorEntityName(refactorEntityNameDTO)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}

@JsonView(Views.Public.class)
Expand All @@ -143,6 +143,6 @@ public Mono<ResponseDTO<ActionCollectionDTO>> deleteActionCollection(@PathVariab
log.debug("Going to delete unpublished action collection with id: {}", id);
return actionCollectionService
.deleteUnpublishedActionCollection(id)
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK, deletedResource));
}
}
20 changes: 9 additions & 11 deletions .../appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public Mono<ResponseDTO<ActionDTO>> createAction(
log.debug("Going to create resource {}", resource.getClass().getName());
return layoutActionService
.createSingleAction(resource)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}

@JsonView(Views.Public.class)
Expand All @@ -69,7 +69,7 @@ public Mono<ResponseDTO<ActionDTO>> updateAction(
log.debug("Going to update resource with branchedActionId: {}", branchedActionId);
return layoutActionService
.updateNewActionByBranchedId(branchedActionId, resource)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}

@JsonView(Views.Public.class)
Expand All @@ -82,7 +82,7 @@ public Mono<ResponseDTO<ActionExecutionResult>> executeAction(
return actionExecutionSolution
.executeAction(
partFlux, environmentId, serverWebExchange.getRequest().getHeaders(), Boolean.FALSE)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}

@JsonView(Views.Public.class)
Expand All @@ -93,9 +93,7 @@ public Mono<ResponseDTO<ActionDTO>> moveAction(@RequestBody @Valid ActionMoveDTO
actionMoveDTO.getAction().getName(),
actionMoveDTO.getAction().getPageId(),
actionMoveDTO.getDestinationPageId());
return layoutActionService
.moveAction(actionMoveDTO)
.map(action -> new ResponseDTO<>(HttpStatus.OK.value(), action, null));
return layoutActionService.moveAction(actionMoveDTO).map(action -> new ResponseDTO<>(HttpStatus.OK, action));
}

@JsonView(Views.Public.class)
Expand All @@ -104,7 +102,7 @@ public Mono<ResponseDTO<LayoutDTO>> refactorActionName(@RequestBody RefactorEnti
refactorEntityNameDTO.setEntityType(EntityType.ACTION);
return refactoringService
.refactorEntityName(refactorEntityNameDTO)
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.OK, created));
}

@JsonView(Views.Public.class)
Expand All @@ -114,7 +112,7 @@ public Mono<ResponseDTO<List<ActionViewDTO>>> getActionsForViewMode(
return newActionService
.getActionsForViewMode(branchedApplicationId)
.collectList()
.map(actions -> new ResponseDTO<>(HttpStatus.OK.value(), actions, null));
.map(actions -> new ResponseDTO<>(HttpStatus.OK, actions));
}

@JsonView(Views.Public.class)
Expand All @@ -124,7 +122,7 @@ public Mono<ResponseDTO<ActionDTO>> setExecuteOnLoad(
log.debug("Going to set execute on load for action id {} to {}", branchedActionId, flag);
return layoutActionService
.setExecuteOnLoad(branchedActionId, flag)
.map(action -> new ResponseDTO<>(HttpStatus.OK.value(), action, null));
.map(action -> new ResponseDTO<>(HttpStatus.OK, action));
}

@JsonView(Views.Public.class)
Expand All @@ -134,7 +132,7 @@ public Mono<ResponseDTO<ActionDTO>> deleteAction(
log.debug("Going to delete unpublished action with id: {}, branchName: {}", id, branchName);
return layoutActionService
.deleteUnpublishedAction(id)
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK, deletedResource));
}

/**
Expand All @@ -154,6 +152,6 @@ public Mono<ResponseDTO<List<ActionDTO>>> getAllUnpublishedActions(
return newActionService
.getUnpublishedActionsExceptJs(params)
.collectList()
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
}
Loading