http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java index 81561e4..f932509 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java @@ -83,8 +83,7 @@ import com.google.common.collect.Maps; public class CubeController extends BasicController { private static final Logger logger = LoggerFactory.getLogger(CubeController.class); - private static final char[] VALID_CUBENAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" - .toCharArray(); + private static final char[] VALID_CUBENAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_".toCharArray(); @Autowired @Qualifier("cubeMgmtService") @@ -100,11 +99,7 @@ public class CubeController extends BasicController { @RequestMapping(value = "", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<CubeInstance> getCubes(@RequestParam(value = "cubeName", required = false) String cubeName, - @RequestParam(value = "modelName", required = false) String modelName, - @RequestParam(value = "projectName", required = false) String projectName, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "offset", required = false) Integer offset) { + public List<CubeInstance> getCubes(@RequestParam(value = "cubeName", required = false) String cubeName, @RequestParam(value = "modelName", required = false) String modelName, @RequestParam(value = "projectName", required = false) String projectName, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) { List<CubeInstance> cubes; cubes = cubeService.listAllCubes(cubeName, projectName, modelName); @@ -153,8 +148,7 @@ public class CubeController extends BasicController { * @throws UnknownHostException * @throws IOException */ - @RequestMapping(value = "/{cubeName}/segs/{segmentName}/sql", method = { RequestMethod.GET }, produces = { - "application/json" }) + @RequestMapping(value = "/{cubeName}/segs/{segmentName}/sql", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody public GeneralResponse getSql(@PathVariable String cubeName, @PathVariable String segmentName) { CubeInstance cube = cubeService.getCubeManager().getCube(cubeName); @@ -174,8 +168,7 @@ public class CubeController extends BasicController { * @param notifyList * @throws IOException */ - @RequestMapping(value = "/{cubeName}/notify_list", method = { RequestMethod.PUT }, produces = { - "application/json" }) + @RequestMapping(value = "/{cubeName}/notify_list", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody public void updateNotifyList(@PathVariable String cubeName, @RequestBody List<String> notifyList) { CubeInstance cube = cubeService.getCubeManager().getCube(cubeName); @@ -215,11 +208,9 @@ public class CubeController extends BasicController { * * @throws IOException */ - @RequestMapping(value = "/{cubeName}/segs/{segmentName}/refresh_lookup", method = { - RequestMethod.PUT }, produces = { "application/json" }) + @RequestMapping(value = "/{cubeName}/segs/{segmentName}/refresh_lookup", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody - public CubeInstance rebuildLookupSnapshot(@PathVariable String cubeName, @PathVariable String segmentName, - @RequestParam(value = "lookupTable") String lookupTable) { + public CubeInstance rebuildLookupSnapshot(@PathVariable String cubeName, @PathVariable String segmentName, @RequestParam(value = "lookupTable") String lookupTable) { try { final CubeManager cubeMgr = cubeService.getCubeManager(); final CubeInstance cube = cubeMgr.getCube(cubeName); @@ -235,8 +226,7 @@ public class CubeController extends BasicController { * * @throws IOException */ - @RequestMapping(value = "/{cubeName}/segs/{segmentName}", method = { RequestMethod.DELETE }, produces = { - "application/json" }) + @RequestMapping(value = "/{cubeName}/segs/{segmentName}", method = { RequestMethod.DELETE }, produces = { "application/json" }) @ResponseBody public CubeInstance deleteSegment(@PathVariable String cubeName, @PathVariable String segmentName) { CubeInstance cube = cubeService.getCubeManager().getCube(cubeName); @@ -271,8 +261,7 @@ public class CubeController extends BasicController { @RequestMapping(value = "/{cubeName}/rebuild", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody public JobInstance rebuild(@PathVariable String cubeName, @RequestBody JobBuildRequest req) { - return buildInternal(cubeName, req.getStartTime(), req.getEndTime(), 0, 0, null, null, req.getBuildType(), - req.isForce() || req.isForceMergeEmptySegment()); + return buildInternal(cubeName, req.getStartTime(), req.getEndTime(), 0, 0, null, null, req.getBuildType(), req.isForce() || req.isForceMergeEmptySegment()); } /** Build/Rebuild a cube segment by source offset */ @@ -298,14 +287,11 @@ public class CubeController extends BasicController { @RequestMapping(value = "/{cubeName}/rebuild2", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody public JobInstance rebuild2(@PathVariable String cubeName, @RequestBody JobBuildRequest2 req) { - return buildInternal(cubeName, 0, 0, req.getSourceOffsetStart(), req.getSourceOffsetEnd(), - req.getSourcePartitionOffsetStart(), req.getSourcePartitionOffsetEnd(), req.getBuildType(), - req.isForce()); + return buildInternal(cubeName, 0, 0, req.getSourceOffsetStart(), req.getSourceOffsetEnd(), req.getSourcePartitionOffsetStart(), req.getSourcePartitionOffsetEnd(), req.getBuildType(), req.isForce()); } private JobInstance buildInternal(String cubeName, long startTime, long endTime, // - long startOffset, long endOffset, Map<Integer, Long> sourcePartitionOffsetStart, - Map<Integer, Long> sourcePartitionOffsetEnd, String buildType, boolean force) { + long startOffset, long endOffset, Map<Integer, Long> sourcePartitionOffsetStart, Map<Integer, Long> sourcePartitionOffsetEnd, String buildType, boolean force) { try { String submitter = SecurityContextHolder.getContext().getAuthentication().getName(); CubeInstance cube = jobService.getCubeManager().getCube(cubeName); @@ -317,8 +303,7 @@ public class CubeController extends BasicController { throw new BadRequestException("Cannot build draft cube"); } return jobService.submitJob(cube, startTime, endTime, startOffset, endOffset, // - sourcePartitionOffsetStart, sourcePartitionOffsetEnd, CubeBuildTypeEnum.valueOf(buildType), force, - submitter); + sourcePartitionOffsetStart, sourcePartitionOffsetEnd, CubeBuildTypeEnum.valueOf(buildType), force, submitter); } catch (Throwable e) { logger.error(e.getLocalizedMessage(), e); throw new InternalErrorException(e.getLocalizedMessage(), e); @@ -466,8 +451,7 @@ public class CubeController extends BasicController { try { desc.setUuid(UUID.randomUUID().toString()); - String projectName = (null == cubeRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME - : cubeRequest.getProject(); + String projectName = (null == cubeRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME : cubeRequest.getProject(); cubeService.createCubeAndDesc(name, projectName, desc); } catch (Exception e) { logger.error("Failed to deal with the request.", e); @@ -495,8 +479,7 @@ public class CubeController extends BasicController { return cubeRequest; } - String projectName = (null == cubeRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME - : cubeRequest.getProject(); + String projectName = (null == cubeRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME : cubeRequest.getProject(); try { CubeInstance cube = cubeService.getCubeManager().getCube(cubeRequest.getCubeName()); @@ -508,15 +491,13 @@ public class CubeController extends BasicController { //cube renaming is not allowed if (!cube.getDescriptor().getName().equalsIgnoreCase(desc.getName())) { - String error = "Cube Desc renaming is not allowed: desc.getName(): " + desc.getName() - + ", cubeRequest.getCubeName(): " + cubeRequest.getCubeName(); + String error = "Cube Desc renaming is not allowed: desc.getName(): " + desc.getName() + ", cubeRequest.getCubeName(): " + cubeRequest.getCubeName(); updateRequest(cubeRequest, false, error); return cubeRequest; } if (cube.getSegments().size() != 0 && !cube.getDescriptor().consistentWith(desc)) { - String error = "CubeDesc " + desc.getName() - + " is inconsistent with existing. Try purge that cube first or avoid updating key cube desc fields."; + String error = "CubeDesc " + desc.getName() + " is inconsistent with existing. Try purge that cube first or avoid updating key cube desc fields."; updateRequest(cubeRequest, false, error); return cubeRequest; } @@ -666,8 +647,7 @@ public class CubeController extends BasicController { * @param cubeName * @return */ - @RequestMapping(value = "/{cubeName}/init_start_offsets", method = { RequestMethod.PUT }, produces = { - "application/json" }) + @RequestMapping(value = "/{cubeName}/init_start_offsets", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody public GeneralResponse initStartOffsets(@PathVariable String cubeName) { checkCubeName(cubeName);
http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/DiagnosisController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/DiagnosisController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/DiagnosisController.java index 8df13c1..108ec5a 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/DiagnosisController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/DiagnosisController.java @@ -72,11 +72,9 @@ public class DiagnosisController extends BasicController { /** * Get diagnosis information for project */ - @RequestMapping(value = "/project/{project}/download", method = { RequestMethod.GET }, produces = { - "application/json" }) + @RequestMapping(value = "/project/{project}/download", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public void dumpProjectDiagnosisInfo(@PathVariable String project, final HttpServletRequest request, - final HttpServletResponse response) { + public void dumpProjectDiagnosisInfo(@PathVariable String project, final HttpServletRequest request, final HttpServletResponse response) { String filePath; try { filePath = dgService.dumpProjectDiagnosisInfo(project); @@ -92,8 +90,7 @@ public class DiagnosisController extends BasicController { */ @RequestMapping(value = "/job/{jobId}/download", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public void dumpJobDiagnosisInfo(@PathVariable String jobId, final HttpServletRequest request, - final HttpServletResponse response) { + public void dumpJobDiagnosisInfo(@PathVariable String jobId, final HttpServletRequest request, final HttpServletResponse response) { String filePath; try { filePath = dgService.dumpJobDiagnosisInfo(jobId); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java index 92212c4..4ae7656 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java @@ -80,8 +80,7 @@ public class ExternalFilterController extends BasicController { @RequestMapping(value = "/{filter}/{project}", method = { RequestMethod.DELETE }, produces = { "application/json" }) @ResponseBody - public Map<String, String> removeFilter(@PathVariable String filter, @PathVariable String project) - throws IOException { + public Map<String, String> removeFilter(@PathVariable String filter, @PathVariable String project) throws IOException { Map<String, String> result = new HashMap<String, String>(); extFilterService.removeExtFilterFromProject(filter, project); extFilterService.removeExternalFilter(filter); @@ -91,8 +90,7 @@ public class ExternalFilterController extends BasicController { @RequestMapping(value = "", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<ExternalFilterDesc> getExternalFilters(@RequestParam(value = "project", required = true) String project) - throws IOException { + public List<ExternalFilterDesc> getExternalFilters(@RequestParam(value = "project", required = true) String project) throws IOException { List<ExternalFilterDesc> filterDescs = Lists.newArrayList(); filterDescs.addAll(extFilterService.getProjectManager().listExternalFilterDescs(project).values()); return filterDescs; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java index d70b78f..f23f26c 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java @@ -46,8 +46,7 @@ public class HybridController extends BasicController { checkRequiredArg("project", request.getProject()); checkRequiredArg("model", request.getModel()); checkRequiredArg("cubes", request.getCubes()); - HybridInstance instance = hybridService.createHybridCube(request.getHybrid(), request.getProject(), - request.getModel(), request.getCubes()); + HybridInstance instance = hybridService.createHybridCube(request.getHybrid(), request.getProject(), request.getModel(), request.getCubes()); return instance; } @@ -58,8 +57,7 @@ public class HybridController extends BasicController { checkRequiredArg("project", request.getProject()); checkRequiredArg("model", request.getModel()); checkRequiredArg("cubes", request.getCubes()); - HybridInstance instance = hybridService.updateHybridCube(request.getHybrid(), request.getProject(), - request.getModel(), request.getCubes()); + HybridInstance instance = hybridService.updateHybridCube(request.getHybrid(), request.getProject(), request.getModel(), request.getCubes()); return instance; } @@ -74,8 +72,7 @@ public class HybridController extends BasicController { @RequestMapping(value = "", method = RequestMethod.GET, produces = { "application/json" }) @ResponseBody - public Collection<HybridInstance> list(@RequestParam(required = false) String project, - @RequestParam(required = false) String model) { + public Collection<HybridInstance> list(@RequestParam(required = false) String project, @RequestParam(required = false) String model) { return hybridService.listHybrids(project, model); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java index 749c872..7c9c40d 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java @@ -72,8 +72,7 @@ public class JobController extends BasicController { JobTimeFilterEnum timeFilter = JobTimeFilterEnum.getByCode(jobRequest.getTimeFilter()); try { - jobInstanceList = jobService.searchJobs(jobRequest.getCubeName(), jobRequest.getProjectName(), statusList, - jobRequest.getLimit(), jobRequest.getOffset(), timeFilter); + jobInstanceList = jobService.searchJobs(jobRequest.getCubeName(), jobRequest.getProjectName(), statusList, jobRequest.getLimit(), jobRequest.getOffset(), timeFilter); } catch (Exception e) { logger.error(e.getLocalizedMessage(), e); throw new InternalErrorException(e); @@ -107,8 +106,7 @@ public class JobController extends BasicController { * @return * @throws IOException */ - @RequestMapping(value = "/{jobId}/steps/{stepId}/output", method = { RequestMethod.GET }, produces = { - "application/json" }) + @RequestMapping(value = "/{jobId}/steps/{stepId}/output", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody public Map<String, String> getStepOutput(@PathVariable String jobId, @PathVariable String stepId) { Map<String, String> result = new HashMap<String, String>(); @@ -182,8 +180,7 @@ public class JobController extends BasicController { * @return * @throws IOException */ - @RequestMapping(value = "/{jobId}/steps/{stepId}/rollback", method = { RequestMethod.PUT }, produces = { - "application/json" }) + @RequestMapping(value = "/{jobId}/steps/{stepId}/rollback", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody public JobInstance rollback(@PathVariable String jobId, @PathVariable String stepId) { try { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java index ea293a0..4226e87 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/ModelController.java @@ -63,8 +63,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; public class ModelController extends BasicController { private static final Logger logger = LoggerFactory.getLogger(ModelController.class); - private static final char[] VALID_MODELNAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" - .toCharArray(); + private static final char[] VALID_MODELNAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_".toCharArray(); @Autowired @Qualifier("modelMgmtService") @@ -76,10 +75,7 @@ public class ModelController extends BasicController { @RequestMapping(value = "", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<DataModelDesc> getModels(@RequestParam(value = "modelName", required = false) String modelName, - @RequestParam(value = "projectName", required = false) String projectName, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "offset", required = false) Integer offset) { + public List<DataModelDesc> getModels(@RequestParam(value = "modelName", required = false) String modelName, @RequestParam(value = "projectName", required = false) String projectName, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) { try { return modelService.getModels(modelName, projectName, limit, offset); } catch (IOException e) { @@ -113,8 +109,7 @@ public class ModelController extends BasicController { try { modelDesc.setUuid(UUID.randomUUID().toString()); - String projectName = (null == modelRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME - : modelRequest.getProject(); + String projectName = (null == modelRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME : modelRequest.getProject(); modelService.createModelDesc(projectName, modelDesc); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java index 2e4f633..89c8b23 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java @@ -54,8 +54,7 @@ import org.springframework.web.bind.annotation.ResponseBody; public class ProjectController extends BasicController { private static final Logger logger = LoggerFactory.getLogger(ProjectController.class); - private static final char[] VALID_PROJECTNAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" - .toCharArray(); + private static final char[] VALID_PROJECTNAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_".toCharArray(); @Autowired @Qualifier("projectService") @@ -79,15 +78,13 @@ public class ProjectController extends BasicController { */ @RequestMapping(value = "", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<ProjectInstance> getProjects(@RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "offset", required = false) Integer offset) { + public List<ProjectInstance> getProjects(@RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) { return projectService.listProjects(limit, offset); } @RequestMapping(value = "/readable", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<ProjectInstance> getReadableProjects(@RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "offset", required = false) Integer offset) { + public List<ProjectInstance> getReadableProjects(@RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) { List<ProjectInstance> readableProjects = new ArrayList<ProjectInstance>(); @@ -124,7 +121,7 @@ public class ProjectController extends BasicController { } } } - + if (hasProjectPermission) { readableProjects.add(projectInstance); } @@ -143,8 +140,7 @@ public class ProjectController extends BasicController { } if (!StringUtils.containsOnly(projectDesc.getName(), VALID_PROJECTNAME)) { - logger.info("Invalid Project name {}, only letters, numbers and underline supported.", - projectDesc.getName()); + logger.info("Invalid Project name {}, only letters, numbers and underline supported.", projectDesc.getName()); throw new BadRequestException("Invalid Project name, only letters, numbers and underline supported."); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java index 5338acf..f6bfe3e 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java @@ -26,10 +26,10 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; -import org.apache.kylin.metadata.querymeta.SelectedColumnMeta; -import org.apache.kylin.metadata.querymeta.TableMeta; import org.apache.kylin.rest.exception.InternalErrorException; import org.apache.kylin.rest.model.Query; +import org.apache.kylin.metadata.querymeta.SelectedColumnMeta; +import org.apache.kylin.metadata.querymeta.TableMeta; import org.apache.kylin.rest.request.MetaRequest; import org.apache.kylin.rest.request.PrepareSqlRequest; import org.apache.kylin.rest.request.SQLRequest; @@ -82,8 +82,7 @@ public class QueryController extends BasicController { @ResponseBody public void saveQuery(@RequestBody SaveSqlRequest sqlRequest) throws IOException { String creator = SecurityContextHolder.getContext().getAuthentication().getName(); - Query newQuery = new Query(sqlRequest.getName(), sqlRequest.getProject(), sqlRequest.getSql(), - sqlRequest.getDescription()); + Query newQuery = new Query(sqlRequest.getName(), sqlRequest.getProject(), sqlRequest.getSql(), sqlRequest.getDescription()); queryService.saveQuery(creator, newQuery); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/StreamingController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/StreamingController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/StreamingController.java index 058182c..b0bb02a 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/StreamingController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/StreamingController.java @@ -77,9 +77,7 @@ public class StreamingController extends BasicController { @RequestMapping(value = "/getConfig", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<StreamingConfig> getStreamings(@RequestParam(value = "table", required = false) String table, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "offset", required = false) Integer offset) { + public List<StreamingConfig> getStreamings(@RequestParam(value = "table", required = false) String table, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) { try { return streamingService.getStreamingConfigs(table, limit, offset); } catch (IOException e) { @@ -90,10 +88,7 @@ public class StreamingController extends BasicController { @RequestMapping(value = "/getKfkConfig", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<KafkaConfig> getKafkaConfigs( - @RequestParam(value = "kafkaConfigName", required = false) String kafkaConfigName, - @RequestParam(value = "limit", required = false) Integer limit, - @RequestParam(value = "offset", required = false) Integer offset) { + public List<KafkaConfig> getKafkaConfigs(@RequestParam(value = "kafkaConfigName", required = false) String kafkaConfigName, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "offset", required = false) Integer offset) { try { return kafkaConfigService.getKafkaConfigs(kafkaConfigName, limit, offset); } catch (IOException e) { @@ -150,8 +145,7 @@ public class StreamingController extends BasicController { try { streamingService.dropStreamingConfig(streamingConfig); } catch (IOException e1) { - throw new InternalErrorException( - "StreamingConfig is created, but failed to create KafkaConfig: " + e.getLocalizedMessage()); + throw new InternalErrorException("StreamingConfig is created, but failed to create KafkaConfig: " + e.getLocalizedMessage()); } logger.error("Failed to save KafkaConfig:" + e.getLocalizedMessage(), e); throw new InternalErrorException("Failed to save KafkaConfig: " + e.getLocalizedMessage()); @@ -160,14 +154,11 @@ public class StreamingController extends BasicController { if (saveKafkaSuccess == false || saveStreamingSuccess == false) { if (saveStreamingSuccess == true) { - StreamingConfig sConfig = streamingService.getStreamingManager() - .getStreamingConfig(streamingConfig.getName()); + StreamingConfig sConfig = streamingService.getStreamingManager().getStreamingConfig(streamingConfig.getName()); try { streamingService.dropStreamingConfig(sConfig); } catch (IOException e) { - throw new InternalErrorException( - "Action failed and failed to rollback the created streaming config: " - + e.getLocalizedMessage()); + throw new InternalErrorException("Action failed and failed to rollback the created streaming config: " + e.getLocalizedMessage()); } } if (saveKafkaSuccess == true) { @@ -175,9 +166,7 @@ public class StreamingController extends BasicController { KafkaConfig kConfig = kafkaConfigService.getKafkaConfig(kafkaConfig.getName()); kafkaConfigService.dropKafkaConfig(kConfig); } catch (IOException e) { - throw new InternalErrorException( - "Action failed and failed to rollback the created kafka config: " - + e.getLocalizedMessage()); + throw new InternalErrorException("Action failed and failed to rollback the created kafka config: " + e.getLocalizedMessage()); } } } @@ -189,8 +178,7 @@ public class StreamingController extends BasicController { @RequestMapping(value = "", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody - public StreamingRequest updateStreamingConfig(@RequestBody StreamingRequest streamingRequest) - throws JsonProcessingException { + public StreamingRequest updateStreamingConfig(@RequestBody StreamingRequest streamingRequest) throws JsonProcessingException { StreamingConfig streamingConfig = deserializeSchemalDesc(streamingRequest); KafkaConfig kafkaConfig = deserializeKafkaSchemalDesc(streamingRequest); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java index 06392a8..ebbfeb2 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java @@ -68,8 +68,7 @@ public class TableController extends BasicController { */ @RequestMapping(value = "", method = { RequestMethod.GET }, produces = { "application/json" }) @ResponseBody - public List<TableDesc> getTableDesc(@RequestParam(value = "ext", required = false) boolean withExt, - @RequestParam(value = "project", required = true) String project) throws IOException { + public List<TableDesc> getTableDesc(@RequestParam(value = "ext", required = false) boolean withExt, @RequestParam(value = "project", required = true) String project) throws IOException { try { return tableService.getTableDescByProject(project, withExt); } catch (IOException e) { @@ -95,8 +94,7 @@ public class TableController extends BasicController { @RequestMapping(value = "/{tables}/{project}", method = { RequestMethod.POST }, produces = { "application/json" }) @ResponseBody - public Map<String, String[]> loadHiveTables(@PathVariable String tables, @PathVariable String project, - @RequestBody HiveTableRequest request) throws IOException { + public Map<String, String[]> loadHiveTables(@PathVariable String tables, @PathVariable String project, @RequestBody HiveTableRequest request) throws IOException { String submitter = SecurityContextHolder.getContext().getAuthentication().getName(); Map<String, String[]> result = new HashMap<String, String[]>(); String[] tableNames = StringUtil.splitAndTrim(tables, ","); @@ -152,11 +150,9 @@ public class TableController extends BasicController { * @return Table metadata array * @throws IOException */ - @RequestMapping(value = "/{tableNames}/cardinality", method = { RequestMethod.PUT }, produces = { - "application/json" }) + @RequestMapping(value = "/{tableNames}/cardinality", method = { RequestMethod.PUT }, produces = { "application/json" }) @ResponseBody - public CardinalityRequest generateCardinality(@PathVariable String tableNames, - @RequestBody CardinalityRequest request) throws Exception { + public CardinalityRequest generateCardinality(@PathVariable String tableNames, @RequestBody CardinalityRequest request) throws Exception { String submitter = SecurityContextHolder.getContext().getAuthentication().getName(); String[] tables = tableNames.split(","); try { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller/UserController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/UserController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/UserController.java index 7be73eb..c07c0cb 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/UserController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/UserController.java @@ -76,8 +76,7 @@ public class UserController extends BasicController { return null; } - @RequestMapping(value = "/authentication/authorities", method = RequestMethod.GET, produces = { - "application/json" }) + @RequestMapping(value = "/authentication/authorities", method = RequestMethod.GET, produces = { "application/json" }) public List<String> getAuthorities() throws IOException { return userService.listUserAuthorities(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java index 55b9e15..3258de9 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java @@ -61,11 +61,9 @@ public class AccessControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse getAccessEntitiesV2(@RequestHeader("Accept-Language") String lang, - @PathVariable String type, @PathVariable String uuid) { + public EnvelopeResponse getAccessEntitiesV2(@RequestHeader("Accept-Language") String lang, @PathVariable String type, @PathVariable String uuid) { MsgPicker.setMsg(lang); AclEntity ae = accessService.getAclEntity(type, uuid); @@ -79,11 +77,9 @@ public class AccessControllerV2 extends BasicController { * @param accessRequest */ - @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.POST }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.POST }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse grantV2(@RequestHeader("Accept-Language") String lang, @PathVariable String type, - @PathVariable String uuid, @RequestBody AccessRequest accessRequest) { + public EnvelopeResponse grantV2(@RequestHeader("Accept-Language") String lang, @PathVariable String type, @PathVariable String uuid, @RequestBody AccessRequest accessRequest) { MsgPicker.setMsg(lang); AclEntity ae = accessService.getAclEntity(type, uuid); @@ -100,11 +96,9 @@ public class AccessControllerV2 extends BasicController { * @param accessRequest */ - @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse updateV2(@RequestHeader("Accept-Language") String lang, @PathVariable String type, - @PathVariable String uuid, @RequestBody AccessRequest accessRequest) { + public EnvelopeResponse updateV2(@RequestHeader("Accept-Language") String lang, @PathVariable String type, @PathVariable String uuid, @RequestBody AccessRequest accessRequest) { MsgPicker.setMsg(lang); AclEntity ae = accessService.getAclEntity(type, uuid); @@ -120,11 +114,9 @@ public class AccessControllerV2 extends BasicController { * @param accessRequest */ - @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.DELETE }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{type}/{uuid}", method = { RequestMethod.DELETE }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse revokeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String type, - @PathVariable String uuid, AccessRequest accessRequest) { + public EnvelopeResponse revokeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String type, @PathVariable String uuid, AccessRequest accessRequest) { MsgPicker.setMsg(lang); AclEntity ae = accessService.getAclEntity(type, uuid); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/AdminControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/AdminControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/AdminControllerV2.java index c0121d5..01176d0 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/AdminControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/AdminControllerV2.java @@ -57,8 +57,7 @@ public class AdminControllerV2 extends BasicController { @Qualifier("cubeMgmtService") private CubeService cubeMgmtService; - @RequestMapping(value = "/env", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/env", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getEnvV2(@RequestHeader("Accept-Language") String lang) throws ConfigurationException { MsgPicker.setMsg(lang); @@ -66,8 +65,7 @@ public class AdminControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, adminService.getEnv(), ""); } - @RequestMapping(value = "/config", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/config", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getConfigV2(@RequestHeader("Accept-Language") String lang) throws IOException { MsgPicker.setMsg(lang); @@ -75,15 +73,13 @@ public class AdminControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, adminService.getConfigAsString(), ""); } - @RequestMapping(value = "/metrics/cubes", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/metrics/cubes", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse cubeMetricsV2(@RequestHeader("Accept-Language") String lang, MetricsRequest request) { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, cubeMgmtService.calculateMetrics(request), ""); } - @RequestMapping(value = "/storage", method = { RequestMethod.DELETE }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/storage", method = { RequestMethod.DELETE }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public void cleanupStorageV2(@RequestHeader("Accept-Language") String lang) { MsgPicker.setMsg(lang); @@ -91,11 +87,9 @@ public class AdminControllerV2 extends BasicController { adminService.cleanupStorage(); } - @RequestMapping(value = "/config", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/config", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void updateKylinConfigV2(@RequestHeader("Accept-Language") String lang, - @RequestBody UpdateConfigRequest updateConfigRequest) { + public void updateKylinConfigV2(@RequestHeader("Accept-Language") String lang, @RequestBody UpdateConfigRequest updateConfigRequest) { MsgPicker.setMsg(lang); KylinConfig.getInstanceFromEnv().setProperty(updateConfigRequest.getKey(), updateConfigRequest.getValue()); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/CacheControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/CacheControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/CacheControllerV2.java index 64e8f7c..3cd5abd 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/CacheControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/CacheControllerV2.java @@ -56,11 +56,9 @@ public class CacheControllerV2 extends BasicController { * Announce wipe cache to all cluster nodes */ - @RequestMapping(value = "/announce/{entity}/{cacheKey}/{event}", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/announce/{entity}/{cacheKey}/{event}", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void announceWipeCacheV2(@RequestHeader("Accept-Language") String lang, @PathVariable String entity, - @PathVariable String event, @PathVariable String cacheKey) throws IOException { + public void announceWipeCacheV2(@RequestHeader("Accept-Language") String lang, @PathVariable String entity, @PathVariable String event, @PathVariable String cacheKey) throws IOException { MsgPicker.setMsg(lang); cacheService.annouceWipeCache(entity, event, cacheKey); @@ -70,18 +68,15 @@ public class CacheControllerV2 extends BasicController { * Wipe cache on this node */ - @RequestMapping(value = "/{entity}/{cacheKey}/{event}", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{entity}/{cacheKey}/{event}", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void wipeCacheV2(@RequestHeader("Accept-Language") String lang, @PathVariable String entity, - @PathVariable String event, @PathVariable String cacheKey) throws IOException { + public void wipeCacheV2(@RequestHeader("Accept-Language") String lang, @PathVariable String entity, @PathVariable String event, @PathVariable String cacheKey) throws IOException { MsgPicker.setMsg(lang); cacheService.notifyMetadataChange(entity, Broadcaster.Event.getEvent(event), cacheKey); } - @RequestMapping(value = "/announce/config", method = { RequestMethod.POST }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/announce/config", method = { RequestMethod.POST }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public void hotLoadKylinConfigV2(@RequestHeader("Accept-Language") String lang) throws IOException { MsgPicker.setMsg(lang); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeControllerV2.java index 8a6a37d..386aad2 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeControllerV2.java @@ -87,8 +87,7 @@ import com.google.common.collect.Lists; public class CubeControllerV2 extends BasicController { private static final Logger logger = LoggerFactory.getLogger(CubeControllerV2.class); - public static final char[] VALID_CUBENAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" - .toCharArray(); + public static final char[] VALID_CUBENAME = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_".toCharArray(); @Autowired @Qualifier("cubeMgmtService") @@ -108,12 +107,7 @@ public class CubeControllerV2 extends BasicController { @RequestMapping(value = "", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse getCubesPaging(@RequestHeader("Accept-Language") String lang, - @RequestParam(value = "cubeName", required = false) String cubeName, - @RequestParam(value = "modelName", required = false) String modelName, - @RequestParam(value = "projectName", required = false) String projectName, - @RequestParam(value = "pageOffset", required = false, defaultValue = "0") Integer pageOffset, - @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) { + public EnvelopeResponse getCubesPaging(@RequestHeader("Accept-Language") String lang, @RequestParam(value = "cubeName", required = false) String cubeName, @RequestParam(value = "modelName", required = false) String modelName, @RequestParam(value = "projectName", required = false) String projectName, @RequestParam(value = "pageOffset", required = false, defaultValue = "0") Integer pageOffset, @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) { MsgPicker.setMsg(lang); HashMap<String, Object> data = new HashMap<String, Object>(); @@ -142,8 +136,7 @@ public class CubeControllerV2 extends BasicController { DataModelDesc getModel = modelService.getMetadataManager().getDataModelDesc(getModelName); cubeInstanceResponse.setPartitionDateColumn(getModel.getPartitionDesc().getPartitionDateColumn()); - cubeInstanceResponse.setIs_streaming( - getModel.getRootFactTable().getTableDesc().getSourceType() == ISourceAware.ID_STREAMING); + cubeInstanceResponse.setIs_streaming(getModel.getRootFactTable().getTableDesc().getSourceType() == ISourceAware.ID_STREAMING); if (projectName != null) cubeInstanceResponse.setProject(projectName); @@ -165,8 +158,7 @@ public class CubeControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, data, ""); } - @RequestMapping(value = "validEncodings", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "validEncodings", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getValidEncodingsV2(@RequestHeader("Accept-Language") String lang) { MsgPicker.setMsg(lang); @@ -175,8 +167,7 @@ public class CubeControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, encodings, ""); } - @RequestMapping(value = "/{cubeName}", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { MsgPicker.setMsg(lang); @@ -196,8 +187,7 @@ public class CubeControllerV2 extends BasicController { DataModelDesc model = modelService.getMetadataManager().getDataModelDesc(modelName); cubeInstanceResponse.setPartitionDateColumn(model.getPartitionDesc().getPartitionDateColumn()); - cubeInstanceResponse - .setIs_streaming(model.getRootFactTable().getTableDesc().getSourceType() == ISourceAware.ID_STREAMING); + cubeInstanceResponse.setIs_streaming(model.getRootFactTable().getTableDesc().getSourceType() == ISourceAware.ID_STREAMING); List<ProjectInstance> projectInstances = projectService.listProjects(null, null); for (ProjectInstance projectInstance : projectInstances) { @@ -217,8 +207,7 @@ public class CubeControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/sql", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/sql", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getSqlV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { MsgPicker.setMsg(lang); @@ -244,11 +233,9 @@ public class CubeControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/notify_list", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/notify_list", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void updateNotifyListV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, - @RequestBody List<String> notifyList) throws IOException { + public void updateNotifyListV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @RequestBody List<String> notifyList) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -262,11 +249,9 @@ public class CubeControllerV2 extends BasicController { } - @RequestMapping(value = "/{cubeName}/cost", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/cost", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse updateCubeCostV2(@RequestHeader("Accept-Language") String lang, - @PathVariable String cubeName, @RequestBody Integer cost) throws IOException { + public EnvelopeResponse updateCubeCostV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @RequestBody Integer cost) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -283,12 +268,9 @@ public class CubeControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/segs/{segmentName}/refresh_lookup", method = { - RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/segs/{segmentName}/refresh_lookup", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse rebuildLookupSnapshotV2(@RequestHeader("Accept-Language") String lang, - @PathVariable String cubeName, @PathVariable String segmentName, @RequestBody String lookupTable) - throws IOException { + public EnvelopeResponse rebuildLookupSnapshotV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @PathVariable String segmentName, @RequestBody String lookupTable) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -297,8 +279,7 @@ public class CubeControllerV2 extends BasicController { if (cube == null) { throw new BadRequestException(String.format(msg.getCUBE_NOT_FOUND(), cubeName)); } - return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, - cubeService.rebuildLookupSnapshot(cube, segmentName, lookupTable), ""); + return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, cubeService.rebuildLookupSnapshot(cube, segmentName, lookupTable), ""); } /** @@ -307,11 +288,9 @@ public class CubeControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/segs/{segmentName}", method = { RequestMethod.DELETE }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/segs/{segmentName}", method = { RequestMethod.DELETE }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse deleteSegmentV2(@RequestHeader("Accept-Language") String lang, - @PathVariable String cubeName, @PathVariable String segmentName) throws IOException { + public EnvelopeResponse deleteSegmentV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @PathVariable String segmentName) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -331,36 +310,27 @@ public class CubeControllerV2 extends BasicController { /** Build/Rebuild a cube segment */ /** Build/Rebuild a cube segment */ - @RequestMapping(value = "/{cubeName}/build", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/build", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse buildV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, - @RequestBody JobBuildRequest req) throws IOException { + public EnvelopeResponse buildV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @RequestBody JobBuildRequest req) throws IOException { return rebuildV2(lang, cubeName, req); } /** Build/Rebuild a cube segment */ - @RequestMapping(value = "/{cubeName}/rebuild", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/rebuild", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse rebuildV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, - @RequestBody JobBuildRequest req) throws IOException { + public EnvelopeResponse rebuildV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @RequestBody JobBuildRequest req) throws IOException { MsgPicker.setMsg(lang); - return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, - buildInternalV2(cubeName, req.getStartTime(), req.getEndTime(), 0, 0, null, null, req.getBuildType(), - req.isForce() || req.isForceMergeEmptySegment()), - ""); + return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, buildInternalV2(cubeName, req.getStartTime(), req.getEndTime(), 0, 0, null, null, req.getBuildType(), req.isForce() || req.isForceMergeEmptySegment()), ""); } /** Build/Rebuild a cube segment by source offset */ - @RequestMapping(value = "/{cubeName}/build_streaming", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/build_streaming", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse build2V2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, - @RequestBody JobBuildRequest2 req) throws IOException { + public EnvelopeResponse build2V2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @RequestBody JobBuildRequest2 req) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -380,23 +350,16 @@ public class CubeControllerV2 extends BasicController { } /** Build/Rebuild a cube segment by source offset */ - @RequestMapping(value = "/{cubeName}/rebuild_streaming", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/rebuild_streaming", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse rebuild2V2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, - @RequestBody JobBuildRequest2 req) throws IOException { + public EnvelopeResponse rebuild2V2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @RequestBody JobBuildRequest2 req) throws IOException { MsgPicker.setMsg(lang); - return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, - buildInternalV2(cubeName, 0, 0, req.getSourceOffsetStart(), req.getSourceOffsetEnd(), - req.getSourcePartitionOffsetStart(), req.getSourcePartitionOffsetEnd(), req.getBuildType(), - req.isForce()), - ""); + return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, buildInternalV2(cubeName, 0, 0, req.getSourceOffsetStart(), req.getSourceOffsetEnd(), req.getSourcePartitionOffsetStart(), req.getSourcePartitionOffsetEnd(), req.getBuildType(), req.isForce()), ""); } private JobInstance buildInternalV2(String cubeName, long startTime, long endTime, // - long startOffset, long endOffset, Map<Integer, Long> sourcePartitionOffsetStart, - Map<Integer, Long> sourcePartitionOffsetEnd, String buildType, boolean force) throws IOException { + long startOffset, long endOffset, Map<Integer, Long> sourcePartitionOffsetStart, Map<Integer, Long> sourcePartitionOffsetEnd, String buildType, boolean force) throws IOException { Message msg = MsgPicker.getMsg(); String submitter = SecurityContextHolder.getContext().getAuthentication().getName(); @@ -409,15 +372,12 @@ public class CubeControllerV2 extends BasicController { throw new BadRequestException(msg.getBUILD_DRAFT_CUBE()); } return jobService.submitJob(cube, startTime, endTime, startOffset, endOffset, // - sourcePartitionOffsetStart, sourcePartitionOffsetEnd, CubeBuildTypeEnum.valueOf(buildType), force, - submitter); + sourcePartitionOffsetStart, sourcePartitionOffsetEnd, CubeBuildTypeEnum.valueOf(buildType), force, submitter); } - @RequestMapping(value = "/{cubeName}/disable", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/disable", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse disableCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) - throws IOException { + public EnvelopeResponse disableCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -431,11 +391,9 @@ public class CubeControllerV2 extends BasicController { } - @RequestMapping(value = "/{cubeName}/purge", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/purge", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse purgeCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) - throws IOException { + public EnvelopeResponse purgeCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -447,11 +405,9 @@ public class CubeControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, cubeService.purgeCube(cube), ""); } - @RequestMapping(value = "/{cubeName}/clone", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/clone", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse cloneCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, - @RequestBody CubeRequest cubeRequest) throws IOException { + public EnvelopeResponse cloneCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName, @RequestBody CubeRequest cubeRequest) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -484,11 +440,9 @@ public class CubeControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, newCube, ""); } - @RequestMapping(value = "/{cubeName}/enable", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/enable", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse enableCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) - throws IOException { + public EnvelopeResponse enableCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -500,11 +454,9 @@ public class CubeControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, cubeService.enableCube(cube), ""); } - @RequestMapping(value = "/{cubeName}", method = { RequestMethod.DELETE }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}", method = { RequestMethod.DELETE }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void deleteCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) - throws IOException { + public void deleteCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -525,11 +477,9 @@ public class CubeControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/hbase", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/hbase", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse getHBaseInfoV2(@RequestHeader("Accept-Language") String lang, - @PathVariable String cubeName) { + public EnvelopeResponse getHBaseInfoV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -581,15 +531,13 @@ public class CubeControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/holes", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/holes", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getHolesV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { MsgPicker.setMsg(lang); checkCubeNameV2(cubeName); - return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, cubeService.getCubeManager().calculateHoles(cubeName), - ""); + return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, cubeService.getCubeManager().calculateHoles(cubeName), ""); } /** @@ -599,8 +547,7 @@ public class CubeControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/holes", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/holes", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse fillHolesV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { MsgPicker.setMsg(lang); @@ -659,11 +606,9 @@ public class CubeControllerV2 extends BasicController { * @return */ - @RequestMapping(value = "/{cubeName}/init_start_offsets", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/init_start_offsets", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse initStartOffsetsV2(@RequestHeader("Accept-Language") String lang, - @PathVariable String cubeName) throws IOException { + public EnvelopeResponse initStartOffsetsV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) throws IOException { MsgPicker.setMsg(lang); Message msg = MsgPicker.getMsg(); @@ -684,11 +629,9 @@ public class CubeControllerV2 extends BasicController { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, response, ""); } - @RequestMapping(value = "/checkNameAvailability/{cubeName}", method = RequestMethod.GET, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/checkNameAvailability/{cubeName}", method = RequestMethod.GET, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse checkNameAvailabilityV2(@RequestHeader("Accept-Language") String lang, - @PathVariable String cubeName) { + public EnvelopeResponse checkNameAvailabilityV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, cubeService.checkNameAvailability(cubeName), ""); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeDescControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeDescControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeDescControllerV2.java index 1f2e8eb..da429f5 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeDescControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/CubeDescControllerV2.java @@ -60,8 +60,7 @@ public class CubeDescControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getCubeV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { MsgPicker.setMsg(lang); @@ -89,8 +88,7 @@ public class CubeDescControllerV2 extends BasicController { * @throws IOException */ - @RequestMapping(value = "/{cubeName}/desc", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{cubeName}/desc", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getDescV2(@RequestHeader("Accept-Language") String lang, @PathVariable String cubeName) { MsgPicker.setMsg(lang); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/DiagnosisControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/DiagnosisControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/DiagnosisControllerV2.java index 9285032..636e81c 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/DiagnosisControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/DiagnosisControllerV2.java @@ -67,14 +67,9 @@ public class DiagnosisControllerV2 extends BasicController { * Get bad query history */ - @RequestMapping(value = "/sql", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/sql", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse getBadQuerySqlV2(@RequestHeader("Accept-Language") String lang, - @RequestParam(value = "project", required = false) String project, - @RequestParam(value = "pageOffset", required = false, defaultValue = "0") Integer pageOffset, - @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) - throws IOException { + public EnvelopeResponse getBadQuerySqlV2(@RequestHeader("Accept-Language") String lang, @RequestParam(value = "project", required = false) String project, @RequestParam(value = "pageOffset", required = false, defaultValue = "0") Integer pageOffset, @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) throws IOException { MsgPicker.setMsg(lang); HashMap<String, Object> data = new HashMap<String, Object>(); @@ -111,11 +106,9 @@ public class DiagnosisControllerV2 extends BasicController { * Get diagnosis information for project */ - @RequestMapping(value = "/project/{project}/download", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/project/{project}/download", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void dumpProjectDiagnosisInfoV2(@RequestHeader("Accept-Language") String lang, @PathVariable String project, - final HttpServletRequest request, final HttpServletResponse response) throws IOException { + public void dumpProjectDiagnosisInfoV2(@RequestHeader("Accept-Language") String lang, @PathVariable String project, final HttpServletRequest request, final HttpServletResponse response) throws IOException { MsgPicker.setMsg(lang); String filePath; @@ -128,11 +121,9 @@ public class DiagnosisControllerV2 extends BasicController { * Get diagnosis information for job */ - @RequestMapping(value = "/job/{jobId}/download", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/job/{jobId}/download", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void dumpJobDiagnosisInfoV2(@RequestHeader("Accept-Language") String lang, @PathVariable String jobId, - final HttpServletRequest request, final HttpServletResponse response) throws IOException { + public void dumpJobDiagnosisInfoV2(@RequestHeader("Accept-Language") String lang, @PathVariable String jobId, final HttpServletRequest request, final HttpServletResponse response) throws IOException { MsgPicker.setMsg(lang); String filePath; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/EncodingControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/EncodingControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/EncodingControllerV2.java index 37792d7..edb58b4 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/EncodingControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/EncodingControllerV2.java @@ -58,8 +58,7 @@ public class EncodingControllerV2 extends BasicController { * @return suggestion map */ - @RequestMapping(value = "valid_encodings", method = { RequestMethod.GET }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "valid_encodings", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getValidEncodingsV2(@RequestHeader("Accept-Language") String lang) { MsgPicker.setMsg(lang); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/ExternalFilterControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/ExternalFilterControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/ExternalFilterControllerV2.java index 5d625a5..4e82b41 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/ExternalFilterControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/ExternalFilterControllerV2.java @@ -57,11 +57,9 @@ public class ExternalFilterControllerV2 extends BasicController { @Qualifier("extFilterService") private ExtFilterService extFilterService; - @RequestMapping(value = "/saveExtFilter", method = { RequestMethod.POST }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/saveExtFilter", method = { RequestMethod.POST }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void saveExternalFilterV2(@RequestHeader("Accept-Language") String lang, - @RequestBody ExternalFilterRequest request) throws IOException { + public void saveExternalFilterV2(@RequestHeader("Accept-Language") String lang, @RequestBody ExternalFilterRequest request) throws IOException { MsgPicker.setMsg(lang); String filterProject = request.getProject(); @@ -71,11 +69,9 @@ public class ExternalFilterControllerV2 extends BasicController { extFilterService.syncExtFilterToProject(new String[] { desc.getName() }, filterProject); } - @RequestMapping(value = "/updateExtFilter", method = { RequestMethod.PUT }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/updateExtFilter", method = { RequestMethod.PUT }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void updateExternalFilterV2(@RequestHeader("Accept-Language") String lang, - @RequestBody ExternalFilterRequest request) throws IOException { + public void updateExternalFilterV2(@RequestHeader("Accept-Language") String lang, @RequestBody ExternalFilterRequest request) throws IOException { MsgPicker.setMsg(lang); ExternalFilterDesc desc = JsonUtil.readValue(request.getExtFilter(), ExternalFilterDesc.class); @@ -83,11 +79,9 @@ public class ExternalFilterControllerV2 extends BasicController { extFilterService.syncExtFilterToProject(new String[] { desc.getName() }, request.getProject()); } - @RequestMapping(value = "/{filter}/{project}", method = { RequestMethod.DELETE }, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "/{filter}/{project}", method = { RequestMethod.DELETE }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public void removeFilterV2(@RequestHeader("Accept-Language") String lang, @PathVariable String filter, - @PathVariable String project) throws IOException { + public void removeFilterV2(@RequestHeader("Accept-Language") String lang, @PathVariable String filter, @PathVariable String project) throws IOException { MsgPicker.setMsg(lang); extFilterService.removeExtFilterFromProject(filter, project); @@ -96,8 +90,7 @@ public class ExternalFilterControllerV2 extends BasicController { @RequestMapping(value = "", method = { RequestMethod.GET }, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse getExternalFiltersV2(@RequestHeader("Accept-Language") String lang, - @RequestParam(value = "project", required = true) String project) throws IOException { + public EnvelopeResponse getExternalFiltersV2(@RequestHeader("Accept-Language") String lang, @RequestParam(value = "project", required = true) String project) throws IOException { MsgPicker.setMsg(lang); List<ExternalFilterDesc> filterDescs = Lists.newArrayList(); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/server-base/src/main/java/org/apache/kylin/rest/controller2/HybridControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/HybridControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/HybridControllerV2.java index 852d16c..ddf745a 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/HybridControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/HybridControllerV2.java @@ -44,31 +44,27 @@ public class HybridControllerV2 extends BasicController { @RequestMapping(value = "", method = RequestMethod.POST, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse createV2(@RequestHeader("Accept-Language") String lang, - @RequestBody HybridRequest request) { + public EnvelopeResponse createV2(@RequestHeader("Accept-Language") String lang, @RequestBody HybridRequest request) { MsgPicker.setMsg(lang); checkRequiredArg("hybrid", request.getHybrid()); checkRequiredArg("project", request.getProject()); checkRequiredArg("model", request.getModel()); checkRequiredArg("cubes", request.getCubes()); - HybridInstance instance = hybridService.createHybridCube(request.getHybrid(), request.getProject(), - request.getModel(), request.getCubes()); + HybridInstance instance = hybridService.createHybridCube(request.getHybrid(), request.getProject(), request.getModel(), request.getCubes()); return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, instance, ""); } @RequestMapping(value = "", method = RequestMethod.PUT, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse updateV2(@RequestHeader("Accept-Language") String lang, - @RequestBody HybridRequest request) { + public EnvelopeResponse updateV2(@RequestHeader("Accept-Language") String lang, @RequestBody HybridRequest request) { MsgPicker.setMsg(lang); checkRequiredArg("hybrid", request.getHybrid()); checkRequiredArg("project", request.getProject()); checkRequiredArg("model", request.getModel()); checkRequiredArg("cubes", request.getCubes()); - HybridInstance instance = hybridService.updateHybridCube(request.getHybrid(), request.getProject(), - request.getModel(), request.getCubes()); + HybridInstance instance = hybridService.updateHybridCube(request.getHybrid(), request.getProject(), request.getModel(), request.getCubes()); return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, instance, ""); } @@ -85,15 +81,13 @@ public class HybridControllerV2 extends BasicController { @RequestMapping(value = "", method = RequestMethod.GET, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody - public EnvelopeResponse listV2(@RequestHeader("Accept-Language") String lang, - @RequestParam(required = false) String project, @RequestParam(required = false) String model) { + public EnvelopeResponse listV2(@RequestHeader("Accept-Language") String lang, @RequestParam(required = false) String project, @RequestParam(required = false) String model) { MsgPicker.setMsg(lang); return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, hybridService.listHybrids(project, model), ""); } - @RequestMapping(value = "{hybrid}", method = RequestMethod.GET, produces = { - "application/vnd.apache.kylin-v2+json" }) + @RequestMapping(value = "{hybrid}", method = RequestMethod.GET, produces = { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse getV2(@RequestHeader("Accept-Language") String lang, @PathVariable String hybrid) { MsgPicker.setMsg(lang);
