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

Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

Browse Source
This commit is contained in:
Automated Github Action 2020-09-23 06:07:19 +00:00
commit 2ee6f553c3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import com.appsmith.server.dtos.ResponseDTO;
import com.appsmith.server.services.DatasourceService; import com.appsmith.server.services.DatasourceService;
import com.appsmith.server.solutions.DatasourceStructureSolution; import com.appsmith.server.solutions.DatasourceStructureSolution;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -42,9 +43,9 @@ public class DatasourceController extends BaseController<DatasourceService, Data
@GetMapping("/{datasourceId}/structure") @GetMapping("/{datasourceId}/structure")
public Mono<ResponseDTO<DatasourceStructure>> getStructure(@PathVariable String datasourceId, public Mono<ResponseDTO<DatasourceStructure>> getStructure(@PathVariable String datasourceId,
@RequestParam(required = false) String ignoreCache) { @RequestParam(required = false, defaultValue = "false") Boolean ignoreCache) {
log.debug("Going to get structure for datasource with id: '{}'.", datasourceId); log.debug("Going to get structure for datasource with id: '{}'.", datasourceId);
return datasourceStructureSolution.getStructure(datasourceId, "true".equalsIgnoreCase(ignoreCache)) return datasourceStructureSolution.getStructure(datasourceId, BooleanUtils.isTrue(ignoreCache))
.map(structure -> new ResponseDTO<>(HttpStatus.OK.value(), structure, null)); .map(structure -> new ResponseDTO<>(HttpStatus.OK.value(), structure, null));
} }