Repository: incubator-griffin Updated Branches: refs/heads/master 1f984da1a -> 0730988fb
add license and fix swagger ui Author: ahutsunshine <[email protected]> Closes #153 from ahutsunshine/master. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/0730988f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/0730988f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/0730988f Branch: refs/heads/master Commit: 0730988fbbf939ad08b3f24d050f732e5dfe6f5d Parents: 1f984da Author: ahutsunshine <[email protected]> Authored: Mon Oct 30 16:17:09 2017 +0800 Committer: Lionel Liu <[email protected]> Committed: Mon Oct 30 16:17:09 2017 +0800 ---------------------------------------------------------------------- .../apache/griffin/core/job/JobController.java | 10 +++++++--- .../griffin/core/measure/MeasureController.java | 2 +- .../griffin/core/job/JobInstanceRepoTest.java | 19 +++++++++++++++++++ .../griffin/core/measure/MeasureTestHelper.java | 19 +++++++++++++++++++ 4 files changed, 46 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0730988f/service/src/main/java/org/apache/griffin/core/job/JobController.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/job/JobController.java b/service/src/main/java/org/apache/griffin/core/job/JobController.java index 432f913..e40e5ad 100644 --- a/service/src/main/java/org/apache/griffin/core/job/JobController.java +++ b/service/src/main/java/org/apache/griffin/core/job/JobController.java @@ -35,7 +35,11 @@ import java.io.Serializable; import java.util.List; import java.util.Map; +<<<<<<< HEAD +@Api(tags = "Jobs", description = "execute your measure periodically") +======= @Api(tags = "Jobs",description = "execute your measure periodically") +>>>>>>> 1f984da1aea86e8be507db37f426b5e28d0d81e8 @RestController @RequestMapping("/api/v1/jobs") public class JobController { @@ -53,10 +57,10 @@ public class JobController { @ApiOperation(value = "Add job", response = GriffinOperationMessage.class) @RequestMapping(value = "", method = RequestMethod.POST) public GriffinOperationMessage addJob(@ApiParam(value = "job group name", required = true) @RequestParam("group") String groupName, - @ApiParam(value = "job name", required = true) @RequestParam("jobName") String jobName, - @ApiParam(value = "measure id, required = true") @RequestParam("measureId") Long measureId, + @ApiParam(value = "job name", required = true) @RequestParam("jobName") String jobName, + @ApiParam(value = "measure id", required = true) @RequestParam("measureId") Long measureId, @ApiParam(value = "custom class composed of job key parameters", required = true) - @RequestBody JobRequestBody jobRequestBody) { + @RequestBody JobRequestBody jobRequestBody) { return jobService.addJob(groupName, jobName, measureId, jobRequestBody); } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0730988f/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java index aaa2db5..52ad0a1 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java +++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureController.java @@ -62,7 +62,7 @@ public class MeasureController { @ApiOperation(value ="Get measures by org",response = List.class) @RequestMapping(value = "/measures/owner/{owner}", method = RequestMethod.GET) - public List<Measure> getAliveMeasuresByOwner(@ApiParam(value = "owner name", required = true) @PathVariable("owner") String owner) { + public List<Measure> getAliveMeasuresByOwner(@ApiParam(value = "org name", required = true) @PathVariable("owner") String owner) { return measureService.getAliveMeasuresByOwner(owner); } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0730988f/service/src/test/java/org/apache/griffin/core/job/JobInstanceRepoTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/job/JobInstanceRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/JobInstanceRepoTest.java index c7df8d2..f36c370 100644 --- a/service/src/test/java/org/apache/griffin/core/job/JobInstanceRepoTest.java +++ b/service/src/test/java/org/apache/griffin/core/job/JobInstanceRepoTest.java @@ -1,3 +1,22 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ + package org.apache.griffin.core.job; import org.apache.griffin.core.job.entity.JobInstance; http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0730988f/service/src/test/java/org/apache/griffin/core/measure/MeasureTestHelper.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureTestHelper.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureTestHelper.java index 7d48f5d..563732c 100644 --- a/service/src/test/java/org/apache/griffin/core/measure/MeasureTestHelper.java +++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureTestHelper.java @@ -1,3 +1,22 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ + package org.apache.griffin.core.measure;
