Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Add simpler constructors for ResponseDTO (#39338)

Browse Source 
## Description

Refactoring to make calls to construct new `ResponseDTO` objects, be
simpler. We aren't using the `ResponseDTO(int status, T data, String
message)` signature with non-`null` value for `message`, so this is
baggage.

I'm not removing that signature in this PR, but that'll come in the next
one. After these changes flow into EE and I migrate the usages there as
well. No need to hurry, slow but steady. 🙂


## Automation

/test sanity

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/13425590614>
> Commit: 486a4d04de9f68e445d41006304f57af2b2ecafa
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=13425590614&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Thu, 20 Feb 2025 01:37:27 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Standardized backend response handling across numerous endpoints for
improved clarity and consistency.
- Enhanced the internal response construction process to ensure reliable
and maintainable operations without impacting any end-user
functionality.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Shrikant Sharat Kandula 2025-02-20 19:43:21 +05:30 committed by GitHub
parent 6dfbfe26ac
commit e8eb4a3947
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 200 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/LogoutSuccessHandlerCE.java
View File

@ -45,7 +45,7 @@ public class LogoutSuccessHandlerCE implements ServerLogoutSuccessHandler {
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);

9
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ConsolidatedAPIController.java
View File

@ -70,8 +70,7 @@ public class ConsolidatedAPIController {
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))
@ -116,7 +115,7 @@ public class ConsolidatedAPIController {
// 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);
}
@ -126,12 +125,12 @@ public class ConsolidatedAPIController {
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);
})

18
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java
View File

@ -55,7 +55,7 @@ public class ActionCollectionControllerCE {
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)
@ -66,7 +66,7 @@ public class ActionCollectionControllerCE {
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)
@ -79,7 +79,7 @@ public class ActionCollectionControllerCE {
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)
@ -89,7 +89,7 @@ public class ActionCollectionControllerCE {
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)
@ -100,7 +100,7 @@ public class ActionCollectionControllerCE {
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)
@ -110,7 +110,7 @@ public class ActionCollectionControllerCE {
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)
@ -120,7 +120,7 @@ public class ActionCollectionControllerCE {
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)
@ -134,7 +134,7 @@ public class ActionCollectionControllerCE {
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)
@ -143,6 +143,6 @@ public class ActionCollectionControllerCE {
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
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionControllerCE.java
View File

@ -58,7 +58,7 @@ public class ActionControllerCE {
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)
@ -69,7 +69,7 @@ public class ActionControllerCE {
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)
@ -82,7 +82,7 @@ public class ActionControllerCE {
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)
@ -93,9 +93,7 @@ public class ActionControllerCE {
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)
@ -104,7 +102,7 @@ public class ActionControllerCE {
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)
@ -114,7 +112,7 @@ public class ActionControllerCE {
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)
@ -124,7 +122,7 @@ public class ActionControllerCE {
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)
@ -134,7 +132,7 @@ public class ActionControllerCE {
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));
}
/**
@ -154,6 +152,6 @@ public class ActionControllerCE {
return newActionService
.getUnpublishedActionsExceptJs(params)
.collectList()
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
}

55
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
View File

@ -83,7 +83,7 @@ public class ApplicationControllerCE {
log.debug("Going to create application in workspace {}", resource.workspaceId());
return applicationPageService
.createApplication(resource.toApplication())
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@ -93,7 +93,7 @@ public class ApplicationControllerCE {
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
return applicationPageService
.publish(branchedApplicationId, true)
.thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), true, null));
.thenReturn(new ResponseDTO<>(HttpStatus.OK, true));
}
@JsonView(Views.Public.class)
@ -102,7 +102,7 @@ public class ApplicationControllerCE {
@PathVariable String branchedApplicationId, @PathVariable String branchedPageId) {
return applicationPageService
.makePageDefault(branchedApplicationId, branchedPageId)
.map(updatedApplication -> new ResponseDTO<>(HttpStatus.OK.value(), updatedApplication, null));
.map(updatedApplication -> new ResponseDTO<>(HttpStatus.OK, updatedApplication));
}
@JsonView(Views.Public.class)
@ -113,7 +113,7 @@ public class ApplicationControllerCE {
@RequestParam Integer order) {
return applicationPageService
.reorderPage(branchedApplicationId, branchedPageId, order)
.map(updatedApplication -> new ResponseDTO<>(HttpStatus.OK.value(), updatedApplication, null));
.map(updatedApplication -> new ResponseDTO<>(HttpStatus.OK, updatedApplication));
}
@JsonView(Views.Public.class)
@ -122,7 +122,7 @@ public class ApplicationControllerCE {
log.debug("Going to delete application with branchedApplicationId: {}", branchedApplicationId);
return applicationPageService
.deleteApplication(branchedApplicationId)
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK, deletedResource));
}
@JsonView(Views.Public.class)
@ -132,16 +132,14 @@ public class ApplicationControllerCE {
log.debug("Going to get all applications by workspace id {}", workspaceId);
return service.findByWorkspaceIdAndBaseApplicationsInRecentlyUsedOrder(workspaceId)
.collectList()
.map(applications -> new ResponseDTO<>(HttpStatus.OK.value(), applications, null));
.map(applications -> new ResponseDTO<>(HttpStatus.OK, applications));
}
@JsonView(Views.Public.class)
@GetMapping(Url.RELEASE_ITEMS)
public Mono<ResponseDTO<ReleaseItemsDTO>> getReleaseItemsInformation() {
log.debug("Going to get version release items");
return userReleaseNotes
.getReleaseItems()
.map(applications -> new ResponseDTO<>(HttpStatus.OK.value(), applications, null));
return userReleaseNotes.getReleaseItems().map(applications -> new ResponseDTO<>(HttpStatus.OK, applications));
}
@JsonView(Views.Public.class)
@ -154,7 +152,7 @@ public class ApplicationControllerCE {
applicationAccessDTO.getPublicAccess());
return service.changeViewAccessForAllBranchesByBranchedApplicationId(
branchedApplicationId, applicationAccessDTO)
.map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
.map(application -> new ResponseDTO<>(HttpStatus.OK, application));
}
@JsonView(Views.Public.class)
@ -162,14 +160,14 @@ public class ApplicationControllerCE {
public Mono<ResponseDTO<Application>> cloneApplication(@PathVariable String branchedApplicationId) {
return applicationPageService
.cloneApplication(branchedApplicationId)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@GetMapping("/view/{branchedApplicationId}")
public Mono<ResponseDTO<Application>> getApplicationInViewMode(@PathVariable String branchedApplicationId) {
return service.getApplicationInViewMode(branchedApplicationId)
.map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
.map(application -> new ResponseDTO<>(HttpStatus.OK, application));
}
@JsonView(Views.Public.class)
@ -178,7 +176,7 @@ public class ApplicationControllerCE {
@PathVariable String branchedApplicationId, @PathVariable String workspaceId) {
return applicationForkingService
.forkApplicationToWorkspace(branchedApplicationId, workspaceId)
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.OK.value(), fetchedResource, null));
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.OK, fetchedResource));
}
@JsonView(Views.Public.class)
@ -201,7 +199,7 @@ public class ApplicationControllerCE {
return applicationSnapshotService
.createApplicationSnapshot(branchedApplicationId)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@ -212,7 +210,7 @@ public class ApplicationControllerCE {
return applicationSnapshotService
.getWithoutDataByBranchedApplicationId(branchedApplicationId)
.map(applicationSnapshot -> new ResponseDTO<>(HttpStatus.OK.value(), applicationSnapshot, null));
.map(applicationSnapshot -> new ResponseDTO<>(HttpStatus.OK, applicationSnapshot));
}
@JsonView(Views.Public.class)
@ -222,7 +220,7 @@ public class ApplicationControllerCE {
return applicationSnapshotService
.deleteSnapshot(branchedApplicationId)
.map(isDeleted -> new ResponseDTO<>(HttpStatus.OK.value(), isDeleted, null));
.map(isDeleted -> new ResponseDTO<>(HttpStatus.OK, isDeleted));
}
@JsonView(Views.Public.class)
@ -232,7 +230,7 @@ public class ApplicationControllerCE {
return applicationSnapshotService
.restoreSnapshot(branchedApplicationId)
.map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
.map(application -> new ResponseDTO<>(HttpStatus.OK, application));
}
@JsonView(Views.Public.class)
@ -244,7 +242,7 @@ public class ApplicationControllerCE {
log.debug("Going to import application in workspace with id: {}", workspaceId);
return fileMono.flatMap(file -> importService.extractArtifactExchangeJsonAndSaveArtifact(
file, workspaceId, branchedApplicationId))
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.OK.value(), fetchedResource, null));
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.OK, fetchedResource));
}
@JsonView(Views.Public.class)
@ -253,14 +251,13 @@ public class ApplicationControllerCE {
@PathVariable String branchedApplicationId, @RequestParam(required = false) String keyType) {
return artifactService
.createOrUpdateSshKeyPair(ArtifactType.APPLICATION, branchedApplicationId, keyType)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@GetMapping("/ssh-keypair/{branchedApplicationId}")
public Mono<ResponseDTO<GitAuthDTO>> getSSHKey(@PathVariable String branchedApplicationId) {
return service.getSshKey(branchedApplicationId)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
return service.getSshKey(branchedApplicationId).map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@ -269,7 +266,7 @@ public class ApplicationControllerCE {
@PathVariable String branchedApplicationId, @RequestBody Application resource) {
log.debug("Going to update resource from base controller with id: {}", branchedApplicationId);
return service.updateApplicationWithPresets(branchedApplicationId, resource)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}
@JsonView(Views.Public.class)
@ -278,7 +275,7 @@ public class ApplicationControllerCE {
@PathVariable String branchedApplicationId, @PathVariable String themeId) {
return themeService
.changeCurrentTheme(themeId, branchedApplicationId)
.map(theme -> new ResponseDTO<>(HttpStatus.OK.value(), theme, null));
.map(theme -> new ResponseDTO<>(HttpStatus.OK, theme));
}
@JsonView(Views.Public.class)
@ -287,7 +284,7 @@ public class ApplicationControllerCE {
@PathVariable String workspaceId, @RequestParam(name = "defaultApplicationId") String baseApplicationId) {
return importService
.findDatasourceByArtifactId(workspaceId, baseApplicationId, APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -295,14 +292,14 @@ public class ApplicationControllerCE {
public Mono<ResponseDTO<Application>> uploadAppNavigationLogo(
@PathVariable String branchedApplicationId, @RequestPart("file") Mono<Part> fileMono) {
return fileMono.flatMap(part -> service.saveAppNavigationLogo(branchedApplicationId, part))
.map(url -> new ResponseDTO<>(HttpStatus.OK.value(), url, null));
.map(url -> new ResponseDTO<>(HttpStatus.OK, url));
}
@JsonView(Views.Public.class)
@DeleteMapping("/{branchedApplicationId}/logo")
public Mono<ResponseDTO<Void>> deleteAppNavigationLogo(@PathVariable String branchedApplicationId) {
return service.deleteAppNavigationLogo(branchedApplicationId)
.thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), null, null));
.thenReturn(new ResponseDTO<>(HttpStatus.OK, null));
}
@JsonView(Views.Public.class)
@ -316,7 +313,7 @@ public class ApplicationControllerCE {
// params - contains ids of jsLib, actions and datasourceIds to be exported
return partialExportService
.getPartialExportResources(branchedApplicationId, branchedPageId, fileDTO)
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.OK.value(), fetchedResource, null));
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.OK, fetchedResource));
}
@JsonView(Views.Public.class)
@ -330,7 +327,7 @@ public class ApplicationControllerCE {
@RequestParam(name = FieldName.PAGE_ID) String branchedPageId) {
return fileMono.flatMap(fileData -> partialImportService.importResourceInPage(
workspaceId, branchedApplicationId, branchedPageId, null, fileData))
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.CREATED.value(), fetchedResource, null));
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.CREATED, fetchedResource));
}
@JsonView(Views.Public.class)
@ -338,6 +335,6 @@ public class ApplicationControllerCE {
public Mono<ResponseDTO<BuildingBlockResponseDTO>> importBlock(@RequestBody BuildingBlockDTO buildingBlockDTO) {
return partialImportService
.importBuildingBlock(buildingBlockDTO)
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.CREATED.value(), fetchedResource, null));
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.CREATED, fetchedResource));
}
}

18
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationTemplateControllerCE.java
View File

@ -34,7 +34,7 @@ public class ApplicationTemplateControllerCE {
public Mono<ResponseDTO<List<ApplicationTemplate>>> getAll() {
return applicationTemplateService
.getActiveTemplates(null)
.map(templates -> new ResponseDTO<>(HttpStatus.OK.value(), templates, null));
.map(templates -> new ResponseDTO<>(HttpStatus.OK, templates));
}
@JsonView(Views.Public.class)
@ -42,7 +42,7 @@ public class ApplicationTemplateControllerCE {
public Mono<ResponseDTO<ApplicationTemplate>> getTemplateDetails(@PathVariable String templateId) {
return applicationTemplateService
.getTemplateDetails(templateId)
.map(templates -> new ResponseDTO<>(HttpStatus.OK.value(), templates, null));
.map(templates -> new ResponseDTO<>(HttpStatus.OK, templates));
}
@JsonView(Views.Public.class)
@ -52,15 +52,13 @@ public class ApplicationTemplateControllerCE {
return applicationTemplateService
.getSimilarTemplates(templateId, params)
.collectList()
.map(templates -> new ResponseDTO<>(HttpStatus.OK.value(), templates, null));
.map(templates -> new ResponseDTO<>(HttpStatus.OK, templates));
}
@JsonView(Views.Public.class)
@GetMapping("filters")
public Mono<ResponseDTO<ApplicationTemplate>> getFilters() {
return applicationTemplateService
.getFilters()
.map(filters -> new ResponseDTO<>(HttpStatus.OK.value(), filters, null));
return applicationTemplateService.getFilters().map(filters -> new ResponseDTO<>(HttpStatus.OK, filters));
}
@JsonView(Views.Public.class)
@ -69,7 +67,7 @@ public class ApplicationTemplateControllerCE {
@PathVariable String templateId, @PathVariable String workspaceId) {
return applicationTemplateService
.importApplicationFromTemplate(templateId, workspaceId)
.map(importedApp -> new ResponseDTO<>(HttpStatus.OK.value(), importedApp, null));
.map(importedApp -> new ResponseDTO<>(HttpStatus.OK, importedApp));
}
@JsonView(Views.Public.class)
@ -81,7 +79,7 @@ public class ApplicationTemplateControllerCE {
@RequestBody(required = false) List<String> pagesToImport) {
return applicationTemplateService
.mergeTemplateWithApplication(templateId, branchedApplicationId, workspaceId, pagesToImport)
.map(importedApp -> new ResponseDTO<>(HttpStatus.OK.value(), importedApp, null));
.map(importedApp -> new ResponseDTO<>(HttpStatus.OK, importedApp));
}
@JsonView(Views.Public.class)
@ -89,7 +87,7 @@ public class ApplicationTemplateControllerCE {
public Mono<ResponseDTO<Application>> publishAsCommunityTemplate(@RequestBody TemplateDTO resource) {
return applicationTemplateService
.publishAsCommunityTemplate(resource)
.map(template -> new ResponseDTO<>(HttpStatus.OK.value(), template, null));
.map(template -> new ResponseDTO<>(HttpStatus.OK, template));
}
@JsonView(Views.Public.class)
@ -97,6 +95,6 @@ public class ApplicationTemplateControllerCE {
public Mono<ResponseDTO<Boolean>> publishAppsmithTemplate(@RequestBody TemplateDTO resource) {
return applicationTemplateService
.publishAppsmithTemplate(resource)
.map(template -> new ResponseDTO<>(HttpStatus.OK.value(), template, null));
.map(template -> new ResponseDTO<>(HttpStatus.OK, template));
}
}

4
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ConfigControllerCE.java
View File

@ -26,12 +26,12 @@ public class ConfigControllerCE {
@JsonView(Views.Public.class)
@GetMapping("/name/{name}")
public Mono<ResponseDTO<Config>> getByName(@PathVariable String name) {
return service.getByName(name).map(resource -> new ResponseDTO<>(HttpStatus.OK.value(), resource, null));
return service.getByName(name).map(resource -> new ResponseDTO<>(HttpStatus.OK, resource));
}
@JsonView(Views.Public.class)
@PutMapping("/name/{name}")
public Mono<ResponseDTO<Config>> updateByName(@PathVariable String name, @RequestBody Config config) {
return service.updateByName(config).map(resource -> new ResponseDTO<>(HttpStatus.OK.value(), resource, null));
return service.updateByName(config).map(resource -> new ResponseDTO<>(HttpStatus.OK, resource));
}
}

8
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/CustomJSLibControllerCE.java
View File

@ -47,7 +47,7 @@ public class CustomJSLibControllerCE {
branchedApplicationId);
return customJSLibService
.addJSLibsToContext(branchedApplicationId, contextType, Set.of(customJSLib), isForceInstall)
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK.value(), actionCollection, null));
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK, actionCollection));
}
@JsonView(Views.Public.class)
@ -64,7 +64,7 @@ public class CustomJSLibControllerCE {
branchedApplicationId);
return customJSLibService
.removeJSLibFromContext(branchedApplicationId, contextType, customJSLib, isForceRemove)
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK.value(), actionCollection, null));
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK, actionCollection));
}
@JsonView(Views.Public.class)
@ -78,7 +78,7 @@ public class CustomJSLibControllerCE {
branchedContextId);
return customJSLibService
.getAllJSLibsInContext(branchedContextId, contextType, false)
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK.value(), actionCollection, null));
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK, actionCollection));
}
@JsonView(Views.Public.class)
@ -94,6 +94,6 @@ public class CustomJSLibControllerCE {
branchName);
return customJSLibService
.getAllJSLibsInContext(branchedContextId, contextType, true)
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK.value(), actionCollection, null));
.map(actionCollection -> new ResponseDTO<>(HttpStatus.OK, actionCollection));
}
}

26
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/DatasourceControllerCE.java
View File

@ -62,7 +62,7 @@ public class DatasourceControllerCE {
return datasourceService
.getAllWithStorages(params)
.collectList()
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
@JsonView(Views.Public.class)
@ -70,9 +70,7 @@ public class DatasourceControllerCE {
@ResponseStatus(HttpStatus.CREATED)
public Mono<ResponseDTO<Datasource>> create(@Valid @RequestBody @JsonView(FromRequest.class) Datasource resource) {
log.debug("Going to create resource from datasource controller");
return datasourceService
.create(resource)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
return datasourceService.create(resource).map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@ -84,7 +82,7 @@ public class DatasourceControllerCE {
log.debug("Going to update resource from datasource controller with id: {}", id);
return datasourceService
.updateDatasource(id, datasource, environmentId, Boolean.TRUE)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}
@JsonView(Views.Public.class)
@ -99,7 +97,7 @@ public class DatasourceControllerCE {
return datasourceService
.updateDatasourceStorage(datasourceStorageDTO, activeEnvironmentId, Boolean.TRUE)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}
@JsonView(Views.Public.class)
@ -108,7 +106,7 @@ public class DatasourceControllerCE {
log.debug("Going to delete resource from datasource controller with id: {}", id);
return datasourceService
.archiveById(id)
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK, deletedResource));
}
@JsonView(Views.Public.class)
@ -120,7 +118,7 @@ public class DatasourceControllerCE {
log.debug("Going to test the datasource with id: {}", datasourceStorageDTO.getDatasourceId());
return datasourceService
.testDatasource(datasourceStorageDTO, activeEnvironmentId)
.map(testResult -> new ResponseDTO<>(HttpStatus.OK.value(), testResult, null));
.map(testResult -> new ResponseDTO<>(HttpStatus.OK, testResult));
}
@JsonView(Views.Public.class)
@ -132,7 +130,7 @@ public class DatasourceControllerCE {
log.debug("Going to get structure for datasource with id: '{}'.", datasourceId);
return datasourceStructureSolution
.getStructure(datasourceId, BooleanUtils.isTrue(ignoreCache), environmentId)
.map(structure -> new ResponseDTO<>(HttpStatus.OK.value(), structure, null));
.map(structure -> new ResponseDTO<>(HttpStatus.OK, structure));
}
@JsonView(Views.Public.class)
@ -169,9 +167,7 @@ public class DatasourceControllerCE {
@JsonView(Views.Public.class)
@GetMapping(Url.MOCKS)
public Mono<ResponseDTO<List<MockDataSet>>> getMockDataSets() {
return mockDataService
.getMockDataSet()
.map(config -> new ResponseDTO<>(HttpStatus.OK.value(), config.getMockdbs(), null));
return mockDataService.getMockDataSet().map(config -> new ResponseDTO<>(HttpStatus.OK, config.getMockdbs()));
}
@JsonView(Views.Public.class)
@ -181,7 +177,7 @@ public class DatasourceControllerCE {
@RequestHeader(name = FieldName.HEADER_ENVIRONMENT_ID, required = false) String environmentId) {
return mockDataService
.createMockDataSet(mockDataSource, environmentId)
.map(datasource -> new ResponseDTO<>(HttpStatus.OK.value(), datasource, null));
.map(datasource -> new ResponseDTO<>(HttpStatus.OK, datasource));
}
@JsonView(Views.Public.class)
@ -193,7 +189,7 @@ public class DatasourceControllerCE {
log.debug("Trigger received for datasource {}", datasourceId);
return datasourceTriggerSolution
.trigger(datasourceId, environmentId, triggerRequestDTO)
.map(triggerResultDTO -> new ResponseDTO<>(HttpStatus.OK.value(), triggerResultDTO, null));
.map(triggerResultDTO -> new ResponseDTO<>(HttpStatus.OK, triggerResultDTO));
}
@JsonView(Views.Public.class)
@ -205,6 +201,6 @@ public class DatasourceControllerCE {
log.debug("Going to get schema preview data for datasource with id: '{}'.", datasourceId);
return datasourceStructureSolution
.getSchemaPreviewData(datasourceId, environmentId, template)
.map(actionExecutionResult -> new ResponseDTO<>(HttpStatus.OK.value(), actionExecutionResult, null));
.map(actionExecutionResult -> new ResponseDTO<>(HttpStatus.OK, actionExecutionResult));
}
}

56
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/GitControllerCE.java
View File

@ -66,7 +66,7 @@ public class GitControllerCE {
public Mono<ResponseDTO<Map<String, GitProfile>>> saveGitProfile(@RequestBody GitProfile gitProfile) {
log.debug("Going to add default git profile for user");
return service.updateOrCreateGitProfileForCurrentUser(gitProfile)
.map(response -> new ResponseDTO<>(HttpStatus.OK.value(), response, null));
.map(response -> new ResponseDTO<>(HttpStatus.OK, response));
}
@JsonView(Views.Public.class)
@ -75,28 +75,28 @@ public class GitControllerCE {
@PathVariable String baseApplicationId, @RequestBody GitProfile gitProfile) {
log.debug("Going to add repo specific git profile for application: {}", baseApplicationId);
return service.updateOrCreateGitProfileForCurrentUser(gitProfile, baseApplicationId)
.map(response -> new ResponseDTO<>(HttpStatus.ACCEPTED.value(), response, null));
.map(response -> new ResponseDTO<>(HttpStatus.ACCEPTED, response));
}
@JsonView(Views.Public.class)
@GetMapping("/profile/default")
public Mono<ResponseDTO<GitProfile>> getDefaultGitConfigForUser() {
return service.getDefaultGitProfileOrCreateIfEmpty()
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK.value(), gitConfigResponse, null));
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK, gitConfigResponse));
}
@JsonView(Views.Public.class)
@GetMapping("/profile/app/{baseApplicationId}")
public Mono<ResponseDTO<GitProfile>> getGitConfigForUser(@PathVariable String baseApplicationId) {
return service.getGitProfileForUser(baseApplicationId)
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK.value(), gitConfigResponse, null));
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK, gitConfigResponse));
}
@JsonView({Views.Metadata.class})
@GetMapping("/metadata/app/{baseArtifactId}")
public Mono<ResponseDTO<GitArtifactMetadata>> getGitMetadata(@PathVariable String baseArtifactId) {
return service.getGitArtifactMetadata(baseArtifactId, ArtifactType.APPLICATION)
.map(metadata -> new ResponseDTO<>(HttpStatus.OK.value(), metadata, null));
.map(metadata -> new ResponseDTO<>(HttpStatus.OK, metadata));
}
@JsonView(Views.Public.class)
@ -107,7 +107,7 @@ public class GitControllerCE {
@RequestHeader("Origin") String originHeader) {
return service.connectArtifactToGit(baseApplicationId, gitConnectDTO, originHeader, ArtifactType.APPLICATION)
.map(artifact -> (Application) artifact)
.map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
.map(application -> new ResponseDTO<>(HttpStatus.OK, application));
}
@JsonView(Views.Public.class)
@ -119,7 +119,7 @@ public class GitControllerCE {
@RequestParam(required = false, defaultValue = "false") Boolean doAmend) {
log.debug("Going to commit branchedApplicationId {}", branchedApplicationId);
return service.commitArtifact(commitDTO, branchedApplicationId, doAmend, ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@ -128,7 +128,7 @@ public class GitControllerCE {
public Mono<ResponseDTO<String>> push(@PathVariable String branchedApplicationId) {
log.debug("Going to push branchedApplicationId {}", branchedApplicationId);
return service.pushArtifact(branchedApplicationId, ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@ -144,7 +144,7 @@ public class GitControllerCE {
srcBranch);
return service.createBranch(branchedApplicationId, branchDTO, ArtifactType.APPLICATION)
.map(artifact -> (Application) artifact)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@ -155,7 +155,7 @@ public class GitControllerCE {
log.debug("Going to checkout to branch {} application {} ", branchName, branchedApplicationId);
return service.checkoutBranch(branchedApplicationId, branchName, true, ArtifactType.APPLICATION)
.map(artifact -> (Application) artifact)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -164,7 +164,7 @@ public class GitControllerCE {
log.debug("Going to remove the remoteUrl for application {}", branchedApplicationId);
return service.detachRemote(branchedApplicationId, ArtifactType.APPLICATION)
.map(artifact -> (Application) artifact)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -172,7 +172,7 @@ public class GitControllerCE {
public Mono<ResponseDTO<GitPullDTO>> pull(@PathVariable String branchedApplicationId) {
log.debug("Going to pull the latest for branchedApplicationId {}", branchedApplicationId);
return service.pullArtifact(branchedApplicationId, ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -183,7 +183,7 @@ public class GitControllerCE {
log.debug("Going to get branch list for application {}", branchedApplicationId);
return service.listBranchForArtifact(
branchedApplicationId, BooleanUtils.isTrue(pruneBranches), ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -193,7 +193,7 @@ public class GitControllerCE {
@RequestParam(required = false, defaultValue = "true") Boolean compareRemote) {
log.debug("Going to get status for default branchedApplicationId {}", branchedApplicationId);
return service.getStatus(branchedApplicationId, compareRemote, ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -201,7 +201,7 @@ public class GitControllerCE {
public Mono<ResponseDTO<BranchTrackingStatus>> fetchRemoteChanges(@PathVariable String branchedApplicationId) {
log.debug("Going to compare with remote for default branchedApplicationId {}", branchedApplicationId);
return service.fetchRemoteChanges(branchedApplicationId, true, ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -214,7 +214,7 @@ public class GitControllerCE {
gitMergeDTO.getDestinationBranch(),
branchedApplicationId);
return service.mergeBranch(branchedApplicationId, gitMergeDTO, ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -227,13 +227,13 @@ public class GitControllerCE {
gitMergeDTO.getDestinationBranch(),
branchedApplicationId);
return service.isBranchMergeable(branchedApplicationId, gitMergeDTO, ArtifactType.APPLICATION)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@GetMapping("/import/keys")
public Mono<ResponseDTO<GitAuth>> generateKeyForGitImport(@RequestParam(required = false) String keyType) {
return service.generateSSHKey(keyType).map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
return service.generateSSHKey(keyType).map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -242,7 +242,7 @@ public class GitControllerCE {
@PathVariable String workspaceId, @RequestBody GitConnectDTO gitConnectDTO) {
return service.importArtifactFromGit(workspaceId, gitConnectDTO, ArtifactType.APPLICATION)
.map(artifactImportDTO -> (ApplicationImportDTO) artifactImportDTO)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@ -252,7 +252,7 @@ public class GitControllerCE {
log.debug("Going to delete branch {} for baseApplicationId {}", branchName, baseArtifactId);
return service.deleteBranch(baseArtifactId, branchName, ArtifactType.APPLICATION)
.map(artifact -> (Application) artifact)
.map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
.map(application -> new ResponseDTO<>(HttpStatus.OK, application));
}
@JsonView(Views.Public.class)
@ -261,7 +261,7 @@ public class GitControllerCE {
log.debug("Going to discard changes for branchedApplicationId {}", branchedApplicationId);
return service.discardChanges(branchedApplicationId, ArtifactType.APPLICATION)
.map(artifact -> (Application) artifact)
.map(result -> new ResponseDTO<>((HttpStatus.OK.value()), result, null));
.map(result -> new ResponseDTO<>((HttpStatus.OK), result));
}
@JsonView(Views.Public.class)
@ -269,13 +269,13 @@ public class GitControllerCE {
public Mono<ResponseDTO<List<GitDeployKeyDTO>>> getSupportedKeys() {
log.debug("Going to list the list of supported keys");
return Mono.just(GitDeployKeyGenerator.getSupportedProtocols())
.map(gitDeployKeyDTOS -> new ResponseDTO<>(HttpStatus.OK.value(), gitDeployKeyDTOS, null));
.map(gitDeployKeyDTOS -> new ResponseDTO<>(HttpStatus.OK, gitDeployKeyDTOS));
}
@JsonView(Views.Public.class)
@GetMapping("/doc-urls")
public Mono<ResponseDTO<List<GitDocsDTO>>> getGitDocs() {
return service.getGitDocUrls().map(gitDocDTO -> new ResponseDTO<>(HttpStatus.OK.value(), gitDocDTO, null));
return service.getGitDocUrls().map(gitDocDTO -> new ResponseDTO<>(HttpStatus.OK, gitDocDTO));
}
@JsonView(Views.Public.class)
@ -285,14 +285,14 @@ public class GitControllerCE {
@RequestBody @Valid BranchProtectionRequestDTO branchProtectionRequestDTO) {
return service.updateProtectedBranches(
baseArtifactId, branchProtectionRequestDTO.getBranchNames(), ArtifactType.APPLICATION)
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@GetMapping("/branch/app/{baseArtifactId}/protected")
public Mono<ResponseDTO<List<String>>> getProtectedBranches(@PathVariable String baseArtifactId) {
return service.getProtectedBranches(baseArtifactId, ArtifactType.APPLICATION)
.map(list -> new ResponseDTO<>(HttpStatus.OK.value(), list, null));
.map(list -> new ResponseDTO<>(HttpStatus.OK, list));
}
@JsonView(Views.Public.class)
@ -300,7 +300,7 @@ public class GitControllerCE {
public Mono<ResponseDTO<AutoCommitResponseDTO>> autoCommitApplication(@PathVariable String branchedApplicationId) {
return autoCommitService
.autoCommitApplication(branchedApplicationId)
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@ -309,13 +309,13 @@ public class GitControllerCE {
@PathVariable String baseApplicationId,
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
return service.getAutoCommitProgress(baseApplicationId, branchName, ArtifactType.APPLICATION)
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@PatchMapping("/auto-commit/toggle/app/{baseArtifactId}")
public Mono<ResponseDTO<Boolean>> toggleAutoCommitEnabled(@PathVariable String baseArtifactId) {
return service.toggleAutoCommitEnabled(baseArtifactId, ArtifactType.APPLICATION)
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
}

2
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/HealthCheckControllerCE.java
View File

@ -22,6 +22,6 @@ public class HealthCheckControllerCE {
@GetMapping
public Mono<ResponseDTO<String>> getHealth() {
log.debug("Checking server health ...");
return healthCheckService.getHealth().map(health -> new ResponseDTO<>(HttpStatus.OK.value(), health, null));
return healthCheckService.getHealth().map(health -> new ResponseDTO<>(HttpStatus.OK, health));
}
}

12
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/InstanceAdminControllerCE.java
View File

@ -33,7 +33,7 @@ public class InstanceAdminControllerCE {
@GetMapping("/env")
public Mono<ResponseDTO<Map<String, String>>> getAll() {
log.debug("Getting all env configuration");
return envManager.getAllNonEmpty().map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
return envManager.getAllNonEmpty().map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@Deprecated
@ -44,9 +44,7 @@ public class InstanceAdminControllerCE {
public Mono<ResponseDTO<Void>> saveEnvChangesJSON(
@Valid @RequestBody Map<String, String> changes, @RequestHeader("Origin") String originHeader) {
log.debug("Applying env updates {}", changes.keySet());
return envManager
.applyChanges(changes, originHeader)
.thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), null, null));
return envManager.applyChanges(changes, originHeader).thenReturn(new ResponseDTO<>(HttpStatus.OK, null));
}
@JsonView(Views.Public.class)
@ -58,20 +56,20 @@ public class InstanceAdminControllerCE {
log.debug("Applying env updates from form data");
return exchange.getMultipartData()
.flatMap(formData -> envManager.applyChangesFromMultipartFormData(formData, originHeader))
.thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), null, null));
.thenReturn(new ResponseDTO<>(HttpStatus.OK, null));
}
@JsonView(Views.Public.class)
@PostMapping("/restart")
public Mono<ResponseDTO<Boolean>> restart() {
log.debug("Received restart request");
return envManager.restart().thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), true, null));
return envManager.restart().thenReturn(new ResponseDTO<>(HttpStatus.OK, true));
}
@JsonView(Views.Public.class)
@PostMapping("/send-test-email")
public Mono<ResponseDTO<Boolean>> sendTestEmail(@RequestBody @Valid TestEmailConfigRequestDTO requestDTO) {
log.debug("Sending test email");
return envManager.sendTestEmail(requestDTO).thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), true, null));
return envManager.sendTestEmail(requestDTO).thenReturn(new ResponseDTO<>(HttpStatus.OK, true));
}
}

10
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/LayoutControllerCE.java
View File

@ -47,7 +47,7 @@ public class LayoutControllerCE {
@GetMapping("/{layoutId}/pages/{branchedPageId}")
public Mono<ResponseDTO<Layout>> getLayout(@PathVariable String branchedPageId, @PathVariable String layoutId) {
return service.getLayout(branchedPageId, layoutId, false)
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.OK, created));
}
@JsonView(Views.Public.class)
@ -57,7 +57,7 @@ public class LayoutControllerCE {
log.debug("update multiple layout received for applicationId {}", applicationId);
return updateLayoutService
.updateMultipleLayouts(applicationId, request)
.map(updatedCount -> new ResponseDTO<>(HttpStatus.OK.value(), updatedCount, null));
.map(updatedCount -> new ResponseDTO<>(HttpStatus.OK, updatedCount));
}
@JsonView(Views.Public.class)
@ -70,14 +70,14 @@ public class LayoutControllerCE {
log.debug("update layout received for page {}", branchedPageId);
return updateLayoutService
.updateLayout(branchedPageId, applicationId, layoutId, dto.toLayout())
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.OK, created));
}
@JsonView(Views.Public.class)
@GetMapping("/{layoutId}/pages/{branchedPageId}/view")
public Mono<ResponseDTO<Layout>> getLayoutView(@PathVariable String branchedPageId, @PathVariable String layoutId) {
return service.getLayout(branchedPageId, layoutId, true)
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.OK, created));
}
@JsonView(Views.Public.class)
@ -86,6 +86,6 @@ public class LayoutControllerCE {
refactorEntityNameDTO.setEntityType(EntityType.WIDGET);
return refactoringService
.refactorEntityName(refactorEntityNameDTO)
.map(created -> new ResponseDTO<>(HttpStatus.OK.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.OK, created));
}
}

5
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/OrganizationControllerCE.java
View File

@ -40,14 +40,13 @@ public class OrganizationControllerCE {
@GetMapping("/current")
public Mono<ResponseDTO<Organization>> getOrganizationConfig() {
log.debug("Attempting to retrieve organization configuration ... ");
return service.getOrganizationConfiguration()
.map(resource -> new ResponseDTO<>(HttpStatus.OK.value(), resource, null));
return service.getOrganizationConfiguration().map(resource -> new ResponseDTO<>(HttpStatus.OK, resource));
}
@PutMapping("")
public Mono<ResponseDTO<Organization>> updateOrganizationConfiguration(
@RequestBody OrganizationConfiguration organizationConfiguration) {
return service.updateDefaultOrganizationConfiguration(organizationConfiguration)
.map(organization -> new ResponseDTO<>(HttpStatus.OK.value(), organization, null));
.map(organization -> new ResponseDTO<>(HttpStatus.OK, organization));
}
}

24
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PageControllerCE.java
View File

@ -52,7 +52,7 @@ public class PageControllerCE {
log.debug("Going to create page {}", page.name());
return applicationPageService
.createPage(page.toPageDTO())
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@ -64,7 +64,7 @@ public class PageControllerCE {
log.debug("Going to create crud-page in application {}", resource.getApplicationId());
return createDBTablePageSolution
.createPageFromDBTable(null, resource, environmentId, null, Boolean.TRUE)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@ -77,7 +77,7 @@ public class PageControllerCE {
log.debug("Going to create CRUD page {}", branchedPageId);
return createDBTablePageSolution
.createPageFromDBTable(branchedPageId, resource, environmentId, null, Boolean.TRUE)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@Deprecated
@ -87,7 +87,7 @@ public class PageControllerCE {
@PathVariable String branchedApplicationId) {
return newPageService
.findApplicationPagesByBranchedApplicationIdAndViewMode(branchedApplicationId, false, true)
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
@JsonView(Views.Public.class)
@ -97,7 +97,7 @@ public class PageControllerCE {
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
return newPageService
.findApplicationPagesByBranchedApplicationIdAndViewMode(branchedApplicationId, true, true)
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
@JsonView(Views.Public.class)
@ -107,7 +107,7 @@ public class PageControllerCE {
@RequestParam(required = false, defaultValue = "false") Boolean migrateDsl) {
return applicationPageService
.getPageAndMigrateDslByBranchedPageId(branchedPageId, false, migrateDsl)
.map(page -> new ResponseDTO<>(HttpStatus.OK.value(), page, null));
.map(page -> new ResponseDTO<>(HttpStatus.OK, page));
}
@JsonView(Views.Public.class)
@ -117,7 +117,7 @@ public class PageControllerCE {
@RequestParam(required = false, defaultValue = "false") Boolean migrateDsl) {
return applicationPageService
.getPageAndMigrateDslByBranchedPageId(branchedPageId, true, migrateDsl)
.map(page -> new ResponseDTO<>(HttpStatus.OK.value(), page, null));
.map(page -> new ResponseDTO<>(HttpStatus.OK, page));
}
/**
@ -135,7 +135,7 @@ public class PageControllerCE {
log.debug("Going to delete page with id: {}", branchedPageId);
return applicationPageService
.deleteUnpublishedPage(branchedPageId)
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK, deletedResource));
}
@JsonView(Views.Public.class)
@ -143,7 +143,7 @@ public class PageControllerCE {
public Mono<ResponseDTO<PageDTO>> clonePage(@PathVariable String branchedPageId) {
return applicationPageService
.clonePage(branchedPageId)
.map(page -> new ResponseDTO<>(HttpStatus.CREATED.value(), page, null));
.map(page -> new ResponseDTO<>(HttpStatus.CREATED, page));
}
@JsonView(Views.Public.class)
@ -153,7 +153,7 @@ public class PageControllerCE {
log.debug("Going to update page with id: {}", branchedPageId);
return newPageService
.updatePage(branchedPageId, resource.toPageDTO())
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}
/**
@ -180,7 +180,7 @@ public class PageControllerCE {
mode);
return newPageService
.findApplicationPages(branchedApplicationId, branchedPageId, mode)
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
@JsonView(Views.Public.class)
@ -191,6 +191,6 @@ public class PageControllerCE {
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
return newPageService
.updateDependencyMap(defaultPageId, dependencyMap, RefType.branch, branchName)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}
}

12
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PluginControllerCE.java
View File

@ -44,21 +44,19 @@ public class PluginControllerCE {
log.debug("Getting all plugins in workspace {}", workspaceId);
return service.getInWorkspace(workspaceId)
.collectList()
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
@JsonView(Views.Public.class)
@GetMapping("/{pluginId}/form")
public Mono<ResponseDTO<Object>> getDatasourceForm(@PathVariable String pluginId) {
return service.getFormConfig(pluginId).map(form -> new ResponseDTO<>(HttpStatus.OK.value(), form, null));
return service.getFormConfig(pluginId).map(form -> new ResponseDTO<>(HttpStatus.OK, form));
}
@JsonView(Views.Public.class)
@GetMapping("/default/icons")
public Mono<ResponseDTO<List<Plugin>>> getDefaultPluginIcons() {
return service.getDefaultPluginIcons()
.collectList()
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
return service.getDefaultPluginIcons().collectList().map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@ -75,7 +73,7 @@ public class PluginControllerCE {
environmentId,
triggerRequestDTO,
serverWebExchange.getRequest().getHeaders())
.map(triggerResultDTO -> new ResponseDTO<>(HttpStatus.OK.value(), triggerResultDTO, null));
.map(triggerResultDTO -> new ResponseDTO<>(HttpStatus.OK, triggerResultDTO));
}
@JsonView(Views.Public.class)
@ -96,6 +94,6 @@ public class PluginControllerCE {
filePartFlux,
requestType,
serverWebExchange.getRequest().getHeaders())
.map(triggerResultDTO -> new ResponseDTO<>(HttpStatus.OK.value(), triggerResultDTO, null));
.map(triggerResultDTO -> new ResponseDTO<>(HttpStatus.OK, triggerResultDTO));
}
}

4
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ProductFeatureAlertControllerCE.java
View File

@ -25,9 +25,9 @@ public class ProductFeatureAlertControllerCE {
public Mono<ResponseDTO<ProductAlertResponseDTO>> generateCode() {
return productAlertService.getSingleApplicableMessage().map(messages -> {
if (messages.size() > 0) {
return new ResponseDTO<>(HttpStatus.OK.value(), messages.get(0), null);
return new ResponseDTO<>(HttpStatus.OK, messages.get(0));
} else {
return new ResponseDTO<>(HttpStatus.OK.value(), new ProductAlertResponseDTO(), null);
return new ResponseDTO<>(HttpStatus.OK, new ProductAlertResponseDTO());
}
});
}

2
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java
View File

@ -50,6 +50,6 @@ public class RestApiImportControllerCE {
}
return service.importAction(input, contextType, contextId, name, workspaceId)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
}

4
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/SaasControllerCE.java
View File

@ -52,7 +52,7 @@ public class SaasControllerCE {
requestAppsmithTokenDTO,
serverWebExchange.getRequest().getHeaders(),
importForGit)
.map(token -> new ResponseDTO<>(HttpStatus.OK.value(), token, null));
.map(token -> new ResponseDTO<>(HttpStatus.OK, token));
}
@JsonView(Views.Public.class)
@ -65,7 +65,7 @@ public class SaasControllerCE {
log.debug("Received callback for an OAuth2 authorization request");
return authenticationService
.getAccessTokenFromCloud(datasourceId, environmentId, appsmithToken)
.map(datasource -> new ResponseDTO<>(HttpStatus.OK.value(), datasource, null));
.map(datasource -> new ResponseDTO<>(HttpStatus.OK, datasource));
}
@GetMapping("authorize")

2
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/SearchEntityControllerCE.java
View File

@ -33,6 +33,6 @@ public class SearchEntityControllerCE {
log.debug("Going to search for entities with search string: {}", keyword);
return searchEntitySolution
.searchEntity(entities, keyword, page, size, Boolean.TRUE)
.map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null));
.map(resources -> new ResponseDTO<>(HttpStatus.OK, resources));
}
}

9
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ThemeControllerCE.java
View File

@ -34,7 +34,7 @@ public class ThemeControllerCE {
public Mono<ResponseDTO<List<Theme>>> getApplicationThemes(@PathVariable String branchedApplicationId) {
return service.getApplicationThemes(branchedApplicationId)
.collectList()
.map(themes -> new ResponseDTO<>(HttpStatus.OK.value(), themes, null));
.map(themes -> new ResponseDTO<>(HttpStatus.OK, themes));
}
@JsonView(Views.Public.class)
@ -43,7 +43,7 @@ public class ThemeControllerCE {
@PathVariable String branchedApplicationId,
@RequestParam(required = false, defaultValue = "EDIT") ApplicationMode mode) {
return service.getApplicationTheme(branchedApplicationId, mode)
.map(theme -> new ResponseDTO<>(HttpStatus.OK.value(), theme, null));
.map(theme -> new ResponseDTO<>(HttpStatus.OK, theme));
}
@JsonView(Views.Public.class)
@ -51,13 +51,12 @@ public class ThemeControllerCE {
public Mono<ResponseDTO<Theme>> updateTheme(
@PathVariable String branchedApplicationId, @Valid @RequestBody Theme resource) {
return service.updateTheme(branchedApplicationId, resource)
.map(theme -> new ResponseDTO<>(HttpStatus.OK.value(), theme, null));
.map(theme -> new ResponseDTO<>(HttpStatus.OK, theme));
}
@JsonView(Views.Public.class)
@PatchMapping("{themeId}")
public Mono<ResponseDTO<Theme>> updateName(@PathVariable String themeId, @Valid @RequestBody Theme resource) {
return service.updateName(themeId, resource)
.map(theme -> new ResponseDTO<>(HttpStatus.OK.value(), theme, null));
return service.updateName(themeId, resource).map(theme -> new ResponseDTO<>(HttpStatus.OK, theme));
}
}

2
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UsagePulseControllerCE.java
View File

@ -25,6 +25,6 @@ public class UsagePulseControllerCE {
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
public Mono<ResponseDTO<Boolean>> create(@RequestBody @Valid UsagePulseDTO usagePulseDTO) {
return service.createPulse(usagePulseDTO).thenReturn(new ResponseDTO<>(HttpStatus.CREATED.value(), true, null));
return service.createPulse(usagePulseDTO).thenReturn(new ResponseDTO<>(HttpStatus.CREATED, true));
}
}

31
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/UserControllerCE.java
View File

@ -72,15 +72,13 @@ public class UserControllerCE {
@PutMapping()
public Mono<ResponseDTO<User>> update(@RequestBody UserUpdateDTO updates, ServerWebExchange exchange) {
return service.updateCurrentUser(updates, exchange)
.map(updatedUser -> new ResponseDTO<>(HttpStatus.OK.value(), updatedUser, null));
.map(updatedUser -> new ResponseDTO<>(HttpStatus.OK, updatedUser));
}
@JsonView(Views.Public.class)
@PutMapping("/leaveWorkspace/{workspaceId}")
public Mono<ResponseDTO<User>> leaveWorkspace(@PathVariable String workspaceId) {
return userWorkspaceService
.leaveWorkspace(workspaceId)
.map(user -> new ResponseDTO<>(HttpStatus.OK.value(), user, null));
return userWorkspaceService.leaveWorkspace(workspaceId).map(user -> new ResponseDTO<>(HttpStatus.OK, user));
}
/**
@ -98,14 +96,13 @@ public class UserControllerCE {
return service.forgotPasswordTokenGenerate(userPasswordDTO)
.defaultIfEmpty(true)
.onErrorReturn(true)
.thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), true, null));
.thenReturn(new ResponseDTO<>(HttpStatus.OK, true));
}
@JsonView(Views.Public.class)
@GetMapping("/verifyPasswordResetToken")
public Mono<ResponseDTO<Boolean>> verifyPasswordResetToken(@RequestParam String token) {
return service.verifyPasswordResetToken(token)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
return service.verifyPasswordResetToken(token).map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -113,14 +110,13 @@ public class UserControllerCE {
public Mono<ResponseDTO<Boolean>> resetPasswordAfterForgotPassword(
@RequestBody ResetUserPasswordDTO userPasswordDTO) {
return service.resetPasswordAfterForgotPassword(userPasswordDTO.getToken(), userPasswordDTO)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@GetMapping("/me")
public Mono<ResponseDTO<UserProfileDTO>> getUserProfile(@AuthenticationPrincipal User user) {
return service.buildUserProfileDTO(user)
.map(profile -> new ResponseDTO<>(HttpStatus.OK.value(), profile, null));
return service.buildUserProfileDTO(user).map(profile -> new ResponseDTO<>(HttpStatus.OK, profile));
}
/**
@ -139,7 +135,7 @@ public class UserControllerCE {
@RequestParam(required = false) String recaptchaToken) {
return userAndAccessManagementService
.inviteUsers(inviteUsersDTO, originHeader, recaptchaToken)
.map(users -> new ResponseDTO<>(HttpStatus.OK.value(), users, null));
.map(users -> new ResponseDTO<>(HttpStatus.OK, users));
}
@JsonView(Views.Public.class)
@ -148,20 +144,19 @@ public class UserControllerCE {
return sessionUserService
.getCurrentUser()
.flatMap(userDataService::setViewedCurrentVersionReleaseNotes)
.thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), null, null));
.thenReturn(new ResponseDTO<>(HttpStatus.OK, null));
}
@JsonView(Views.Public.class)
@PostMapping(value = "/photo", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public Mono<ResponseDTO<UserData>> uploadProfilePhoto(@RequestPart("file") Mono<Part> fileMono) {
return fileMono.flatMap(userDataService::saveProfilePhoto)
.map(url -> new ResponseDTO<>(HttpStatus.OK.value(), url, null));
return fileMono.flatMap(userDataService::saveProfilePhoto).map(url -> new ResponseDTO<>(HttpStatus.OK, url));
}
@JsonView(Views.Public.class)
@DeleteMapping("/photo")
public Mono<ResponseDTO<Void>> deleteProfilePhoto() {
return userDataService.deleteProfilePhoto().thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), null, null));
return userDataService.deleteProfilePhoto().thenReturn(new ResponseDTO<>(HttpStatus.OK, null));
}
@JsonView(Views.Public.class)
@ -183,9 +178,7 @@ public class UserControllerCE {
@JsonView(Views.Public.class)
@GetMapping("/features")
public Mono<ResponseDTO<Map<String, Boolean>>> getFeatureFlags() {
return userDataService
.getFeatureFlagsForCurrentUser()
.map(map -> new ResponseDTO<>(HttpStatus.OK.value(), map, null));
return userDataService.getFeatureFlagsForCurrentUser().map(map -> new ResponseDTO<>(HttpStatus.OK, map));
}
/**
@ -199,7 +192,7 @@ public class UserControllerCE {
@RequestHeader("Origin") String originHeader) {
resendEmailVerificationDTO.setBaseUrl(originHeader);
return service.resendEmailVerification(resendEmailVerificationDTO, null)
.thenReturn(new ResponseDTO<>(HttpStatus.OK.value(), true, null));
.thenReturn(new ResponseDTO<>(HttpStatus.OK, true));
}
/**

23
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java
View File

@ -37,28 +37,26 @@ public class WorkspaceControllerCE {
@JsonView(Views.Public.class)
@GetMapping("/{id}")
public Mono<ResponseDTO<Workspace>> getById(@PathVariable String id) {
return service.getById(id).map(workspace -> new ResponseDTO<>(HttpStatus.OK.value(), workspace, null));
return service.getById(id).map(workspace -> new ResponseDTO<>(HttpStatus.OK, workspace));
}
@JsonView(Views.Public.class)
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
public Mono<ResponseDTO<Workspace>> create(@Valid @RequestBody Workspace resource) {
return service.create(resource).map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
return service.create(resource).map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@PutMapping("/{id}")
public Mono<ResponseDTO<Workspace>> update(@PathVariable String id, @RequestBody Workspace resource) {
return service.update(id, resource)
.map(updatedResource -> new ResponseDTO<>(HttpStatus.OK.value(), updatedResource, null));
return service.update(id, resource).map(updatedResource -> new ResponseDTO<>(HttpStatus.OK, updatedResource));
}
@JsonView(Views.Public.class)
@DeleteMapping("/{id}")
public Mono<ResponseDTO<Workspace>> delete(@PathVariable String id) {
return service.archiveById(id)
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
return service.archiveById(id).map(deletedResource -> new ResponseDTO<>(HttpStatus.OK, deletedResource));
}
/**
@ -69,7 +67,7 @@ public class WorkspaceControllerCE {
public Mono<ResponseDTO<List<PermissionGroupInfoDTO>>> getPermissionGroupsForWorkspace(
@PathVariable String workspaceId) {
return service.getPermissionGroupsForWorkspace(workspaceId)
.map(groupInfoList -> new ResponseDTO<>(HttpStatus.OK.value(), groupInfoList, null));
.map(groupInfoList -> new ResponseDTO<>(HttpStatus.OK, groupInfoList));
}
@JsonView(Views.Public.class)
@ -77,7 +75,7 @@ public class WorkspaceControllerCE {
public Mono<ResponseDTO<List<MemberInfoDTO>>> getUserMembersOfWorkspace(@PathVariable String workspaceId) {
return userWorkspaceService
.getWorkspaceMembers(workspaceId)
.map(users -> new ResponseDTO<>(HttpStatus.OK.value(), users, null));
.map(users -> new ResponseDTO<>(HttpStatus.OK, users));
}
@JsonView(Views.Public.class)
@ -88,7 +86,7 @@ public class WorkspaceControllerCE {
@RequestHeader(name = "Origin", required = false) String originHeader) {
return userWorkspaceService
.updatePermissionGroupForMember(workspaceId, updatePermissionGroupDTO, originHeader)
.map(user -> new ResponseDTO<>(HttpStatus.OK.value(), user, null));
.map(user -> new ResponseDTO<>(HttpStatus.OK, user));
}
@JsonView(Views.Public.class)
@ -96,14 +94,13 @@ public class WorkspaceControllerCE {
public Mono<ResponseDTO<Workspace>> uploadLogo(
@PathVariable String workspaceId, @RequestPart("file") Mono<Part> fileMono) {
return fileMono.flatMap(filePart -> service.uploadLogo(workspaceId, filePart))
.map(url -> new ResponseDTO<>(HttpStatus.OK.value(), url, null));
.map(url -> new ResponseDTO<>(HttpStatus.OK, url));
}
@JsonView(Views.Public.class)
@DeleteMapping("/{workspaceId}/logo")
public Mono<ResponseDTO<Workspace>> deleteLogo(@PathVariable String workspaceId) {
return service.deleteLogo(workspaceId)
.map(workspace -> new ResponseDTO<>(HttpStatus.OK.value(), workspace, null));
return service.deleteLogo(workspaceId).map(workspace -> new ResponseDTO<>(HttpStatus.OK, workspace));
}
@JsonView(Views.Public.class)
@ -112,6 +109,6 @@ public class WorkspaceControllerCE {
@RequestHeader(name = "Host", required = false) String hostname) {
return userWorkspaceService
.getUserWorkspacesByRecentlyUsedOrder(hostname)
.map(workspaces -> new ResponseDTO<>(HttpStatus.OK.value(), workspaces, null));
.map(workspaces -> new ResponseDTO<>(HttpStatus.OK, workspaces));
}
}

5
app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ResponseDTO.java
View File

@ -6,6 +6,7 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.springframework.http.HttpStatus;
import java.io.Serializable;
@ -22,6 +23,10 @@ public class ResponseDTO<T> implements Serializable {
private T data;
public ResponseDTO(HttpStatus status, T data) {
this(status.value(), data, null);
}
public ResponseDTO(int status, T data, String message) {
this.responseMeta = new ResponseMetaDTO(status, message);
this.data = data;

42
app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
View File

@ -61,7 +61,7 @@ public class GitApplicationControllerCE {
public Mono<ResponseDTO<GitArtifactMetadata>> getGitMetadata(@PathVariable String baseApplicationId) {
return centralGitService
.getGitArtifactMetadata(baseApplicationId, ARTIFACT_TYPE)
.map(metadata -> new ResponseDTO<>(HttpStatus.OK.value(), metadata, null));
.map(metadata -> new ResponseDTO<>(HttpStatus.OK, metadata));
}
@JsonView(Views.Public.class)
@ -72,7 +72,7 @@ public class GitApplicationControllerCE {
@RequestHeader("Origin") String originHeader) {
return centralGitService
.connectArtifactToGit(applicationId, ARTIFACT_TYPE, gitConnectDTO, originHeader, GIT_TYPE)
.map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
.map(application -> new ResponseDTO<>(HttpStatus.OK, application));
}
@JsonView(Views.Public.class)
@ -83,7 +83,7 @@ public class GitApplicationControllerCE {
log.info("Going to commit branchedApplicationId {}", branchedApplicationId);
return centralGitService
.commitArtifact(commitDTO, branchedApplicationId, ARTIFACT_TYPE, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@ -99,7 +99,7 @@ public class GitApplicationControllerCE {
srcBranch);
return centralGitService
.createReference(referencedApplicationId, ARTIFACT_TYPE, gitRefDTO, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@ -108,7 +108,7 @@ public class GitApplicationControllerCE {
@PathVariable String referencedApplicationId, @RequestBody GitRefDTO gitRefDTO) {
return centralGitService
.checkoutReference(referencedApplicationId, ARTIFACT_TYPE, gitRefDTO, true, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -117,7 +117,7 @@ public class GitApplicationControllerCE {
log.info("Going to remove the remoteUrl for application {}", branchedApplicationId);
return centralGitService
.detachRemote(branchedApplicationId, ARTIFACT_TYPE, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -126,7 +126,7 @@ public class GitApplicationControllerCE {
log.info("Going to pull the latest for branchedApplicationId {}", branchedApplicationId);
return centralGitService
.pullArtifact(branchedApplicationId, ARTIFACT_TYPE, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -137,7 +137,7 @@ public class GitApplicationControllerCE {
log.info("Going to get status for branchedApplicationId {}", branchedApplicationId);
return centralGitService
.getStatus(branchedApplicationId, ARTIFACT_TYPE, compareRemote, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -148,7 +148,7 @@ public class GitApplicationControllerCE {
log.info("Going to compare with remote for default referencedApplicationId {}", referencedApplicationId);
return centralGitService
.fetchRemoteChanges(referencedApplicationId, ARTIFACT_TYPE, true, GIT_TYPE, refType)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -162,7 +162,7 @@ public class GitApplicationControllerCE {
branchedApplicationId);
return centralGitService
.mergeBranch(branchedApplicationId, ARTIFACT_TYPE, gitMergeDTO, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -176,7 +176,7 @@ public class GitApplicationControllerCE {
branchedApplicationId);
return centralGitService
.isBranchMergable(branchedApplicationId, ARTIFACT_TYPE, gitMergeDTO, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -188,7 +188,7 @@ public class GitApplicationControllerCE {
log.info("Going to delete ref {} for baseApplicationId {}", refName, baseArtifactId);
return centralGitService
.deleteGitReference(baseArtifactId, ARTIFACT_TYPE, refName, refType, GIT_TYPE)
.map(application -> new ResponseDTO<>(HttpStatus.OK.value(), application, null));
.map(application -> new ResponseDTO<>(HttpStatus.OK, application));
}
@JsonView(Views.Public.class)
@ -197,7 +197,7 @@ public class GitApplicationControllerCE {
log.info("Going to discard changes for branchedApplicationId {}", branchedApplicationId);
return centralGitService
.discardChanges(branchedApplicationId, ARTIFACT_TYPE, GIT_TYPE)
.map(result -> new ResponseDTO<>((HttpStatus.OK.value()), result, null));
.map(result -> new ResponseDTO<>((HttpStatus.OK), result));
}
@JsonView(Views.Public.class)
@ -207,7 +207,7 @@ public class GitApplicationControllerCE {
@RequestBody @Valid BranchProtectionRequestDTO branchProtectionRequestDTO) {
return centralGitService
.updateProtectedBranches(baseArtifactId, ARTIFACT_TYPE, branchProtectionRequestDTO.getBranchNames())
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@ -215,7 +215,7 @@ public class GitApplicationControllerCE {
public Mono<ResponseDTO<List<String>>> getProtectedBranches(@PathVariable String baseArtifactId) {
return centralGitService
.getProtectedBranches(baseArtifactId, ARTIFACT_TYPE)
.map(list -> new ResponseDTO<>(HttpStatus.OK.value(), list, null));
.map(list -> new ResponseDTO<>(HttpStatus.OK, list));
}
@JsonView(Views.Public.class)
@ -223,7 +223,7 @@ public class GitApplicationControllerCE {
public Mono<ResponseDTO<AutoCommitResponseDTO>> autoCommitApplication(@PathVariable String branchedApplicationId) {
return autoCommitService
.autoCommitApplication(branchedApplicationId)
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@ -233,7 +233,7 @@ public class GitApplicationControllerCE {
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
return centralGitService
.getAutoCommitProgress(baseApplicationId, ARTIFACT_TYPE, branchName)
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@ -241,7 +241,7 @@ public class GitApplicationControllerCE {
public Mono<ResponseDTO<Boolean>> toggleAutoCommitEnabled(@PathVariable String baseArtifactId) {
return centralGitService
.toggleAutoCommitEnabled(baseArtifactId, ARTIFACT_TYPE)
.map(data -> new ResponseDTO<>(HttpStatus.OK.value(), data, null));
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}
@JsonView(Views.Public.class)
@ -254,7 +254,7 @@ public class GitApplicationControllerCE {
return centralGitService
.listBranchForArtifact(
branchedApplicationId, ARTIFACT_TYPE, BooleanUtils.isTrue(pruneBranches), GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
@JsonView(Views.Public.class)
@ -262,7 +262,7 @@ public class GitApplicationControllerCE {
public Mono<ResponseDTO<GitAuthDTO>> getSSHKey(@PathVariable String branchedApplicationId) {
return artifactService
.getSshKey(ARTIFACT_TYPE, branchedApplicationId)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
@JsonView(Views.Public.class)
@ -271,6 +271,6 @@ public class GitApplicationControllerCE {
@PathVariable String branchedApplicationId, @RequestParam(required = false) String keyType) {
return artifactService
.createOrUpdateSshKeyPair(ARTIFACT_TYPE, branchedApplicationId, keyType)
.map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null));
.map(created -> new ResponseDTO<>(HttpStatus.CREATED, created));
}
}

20
app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitArtifactControllerCE.java
View File

@ -51,7 +51,7 @@ public class GitArtifactControllerCE {
log.debug("Going to add default git profile for user");
return gitProfileUtils
.updateOrCreateGitProfileForCurrentUser(gitProfile)
.map(response -> new ResponseDTO<>(HttpStatus.OK.value(), response, null));
.map(response -> new ResponseDTO<>(HttpStatus.OK, response));
}
@JsonView(Views.Public.class)
@ -59,7 +59,7 @@ public class GitArtifactControllerCE {
public Mono<ResponseDTO<GitProfile>> getDefaultGitConfigForUser() {
return gitProfileUtils
.getDefaultGitProfileOrCreateIfEmpty()
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK.value(), gitConfigResponse, null));
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK, gitConfigResponse));
}
@JsonView(Views.Public.class)
@ -69,7 +69,7 @@ public class GitArtifactControllerCE {
log.debug("Going to add repo specific git profile for application: {}", baseApplicationId);
return gitProfileUtils
.updateOrCreateGitProfileForCurrentUser(gitProfile, baseApplicationId)
.map(response -> new ResponseDTO<>(HttpStatus.ACCEPTED.value(), response, null));
.map(response -> new ResponseDTO<>(HttpStatus.ACCEPTED, response));
}
@JsonView(Views.Public.class)
@ -77,7 +77,7 @@ public class GitArtifactControllerCE {
public Mono<ResponseDTO<GitProfile>> getGitConfigForUser(@PathVariable String baseArtifactId) {
return gitProfileUtils
.getGitProfileForUser(baseArtifactId)
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK.value(), gitConfigResponse, null));
.map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK, gitConfigResponse));
}
@JsonView(Views.Public.class)
@ -88,15 +88,13 @@ public class GitArtifactControllerCE {
// TODO: remove artifact type from methods.
return centralGitService
.importArtifactFromGit(workspaceId, gitConnectDTO, GIT_TYPE)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
.map(result -> new ResponseDTO<>(HttpStatus.CREATED, result));
}
@JsonView(Views.Public.class)
@GetMapping("/doc-urls")
public Mono<ResponseDTO<List<GitDocsDTO>>> getGitDocs() {
return centralGitService
.getGitDocUrls()
.map(gitDocDTO -> new ResponseDTO<>(HttpStatus.OK.value(), gitDocDTO, null));
return centralGitService.getGitDocUrls().map(gitDocDTO -> new ResponseDTO<>(HttpStatus.OK, gitDocDTO));
}
@JsonView(Views.Public.class)
@ -104,14 +102,12 @@ public class GitArtifactControllerCE {
public Mono<ResponseDTO<List<GitDeployKeyDTO>>> getSupportedKeys() {
log.info("Going to list the list of supported keys");
return Mono.just(GitDeployKeyGenerator.getSupportedProtocols())
.map(gitDeployKeyDTOS -> new ResponseDTO<>(HttpStatus.OK.value(), gitDeployKeyDTOS, null));
.map(gitDeployKeyDTOS -> new ResponseDTO<>(HttpStatus.OK, gitDeployKeyDTOS));
}
@JsonView(Views.Public.class)
@GetMapping("/import/keys")
public Mono<ResponseDTO<GitAuth>> generateKeyForGitImport(@RequestParam(required = false) String keyType) {
return centralGitService
.generateSSHKey(keyType)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
return centralGitService.generateSSHKey(keyType).map(result -> new ResponseDTO<>(HttpStatus.OK, result));
}
}

2
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java
View File

@ -121,7 +121,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE {
private final ObservationHelper observationHelper;
protected <T> ResponseDTO<T> getSuccessResponse(T data) {
return new ResponseDTO<>(HttpStatus.OK.value(), data, null);
return new ResponseDTO<>(HttpStatus.OK, data);
}
protected <T> Mono<ResponseDTO<T>> getErrorResponseMono(Throwable error) {