From a2296701e2b907abc51cf3e884d6c85223b8a76c Mon Sep 17 00:00:00 2001 From: louise Date: Wed, 25 Apr 2018 15:37:55 +0800 Subject: [PATCH 1/2] fix doc --- griffin-doc/docker/griffin-docker-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/griffin-doc/docker/griffin-docker-guide.md b/griffin-doc/docker/griffin-docker-guide.md index 6038a0a15..ff1fae920 100644 --- a/griffin-doc/docker/griffin-docker-guide.md +++ b/griffin-doc/docker/griffin-docker-guide.md @@ -45,7 +45,7 @@ Griffin docker images are pre-built on docker hub, users can pull them to try gr docker pull registry.docker-cn.com/bhlx3lyx7/svc_msr:0.2.0 docker pull registry.docker-cn.com/bhlx3lyx7/elasticsearch docker pull registry.docker-cn.com/bhlx3lyx7/kafka - docker pull registry.docker-cn.com/zookeeper:3. + docker pull registry.docker-cn.com/zookeeper:3.5 ``` ## Start the Containers After pulling the images, you can run the docker image in [Batch mode](#how-to-use-griffin-docker-images-in-batch-mode)(always the first choice) or [Streaming mode](#how-to-use-griffin-docker-images-in-streaming-mode)(only if you need a streaming environment like kafka data source). Choose one mode and follow step1&2 to start the docker container. From 390d5203f78350e8ac5a35fcaf8b99ad1b43aaf4 Mon Sep 17 00:00:00 2001 From: DongfangLu Date: Mon, 23 Jul 2018 10:19:49 +0800 Subject: [PATCH 2/2] remove duplicated annotations --- .../apache/griffin/core/job/entity/AbstractJob.java | 10 ---------- .../apache/griffin/core/job/entity/JobDataSegment.java | 3 --- .../griffin/core/job/entity/JobInstanceBean.java | 2 -- .../griffin/core/job/entity/SegmentPredicate.java | 1 - .../griffin/core/measure/entity/DataConnector.java | 4 ---- .../apache/griffin/core/measure/entity/DataSource.java | 1 - .../griffin/core/measure/entity/ExternalMeasure.java | 1 - .../griffin/core/measure/entity/GriffinMeasure.java | 4 ---- .../apache/griffin/core/measure/entity/Measure.java | 1 - .../org/apache/griffin/core/measure/entity/Rule.java | 5 ----- .../core/measure/entity/StreamingPreProcess.java | 2 -- 11 files changed, 34 deletions(-) diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/AbstractJob.java b/service/src/main/java/org/apache/griffin/core/job/entity/AbstractJob.java index df5bb06cb..24f40ef46 100644 --- a/service/src/main/java/org/apache/griffin/core/job/entity/AbstractJob.java +++ b/service/src/main/java/org/apache/griffin/core/job/entity/AbstractJob.java @@ -89,7 +89,6 @@ public Long getMeasureId() { return measureId; } - @JsonProperty("measure.id") public void setMeasureId(Long measureId) { this.measureId = measureId; } @@ -99,7 +98,6 @@ public String getJobName() { return jobName; } - @JsonProperty("job.name") public void setJobName(String jobName) { if (StringUtils.isEmpty(jobName)) { LOGGER.warn("Job name cannot be empty."); @@ -113,7 +111,6 @@ public String getCronExpression() { return cronExpression; } - @JsonProperty("cron.expression") public void setCronExpression(String cronExpression) { this.cronExpression = cronExpression; } @@ -123,7 +120,6 @@ public JobState getJobState() { return jobState; } - @JsonProperty("job.state") public void setJobState(JobState jobState) { this.jobState = jobState; } @@ -133,7 +129,6 @@ public String getTimeZone() { return timeZone; } - @JsonProperty("cron.time.zone") public void setTimeZone(String timeZone) { this.timeZone = timeZone; } @@ -143,7 +138,6 @@ public List getSegments() { return segments; } - @JsonProperty("data.segments") public void setSegments(List segments) { this.segments = segments; } @@ -153,7 +147,6 @@ public Map getConfigMap() { return configMap; } - @JsonProperty("predicate.config") public void setConfigMap(Map configMap) { this.configMap = configMap; } @@ -171,7 +164,6 @@ public String getMetricName() { return metricName; } - @JsonProperty("metric.name") public void setMetricName(String metricName) { this.metricName = metricName; } @@ -189,7 +181,6 @@ public String getName() { return name; } - @JsonProperty("quartz.name") public void setName(String quartzName) { this.name = quartzName; } @@ -199,7 +190,6 @@ public String getGroup() { return group; } - @JsonProperty("quartz.group") public void setGroup(String quartzGroup) { this.group = quartzGroup; } diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/JobDataSegment.java b/service/src/main/java/org/apache/griffin/core/job/entity/JobDataSegment.java index 960c7af9a..313a8555b 100644 --- a/service/src/main/java/org/apache/griffin/core/job/entity/JobDataSegment.java +++ b/service/src/main/java/org/apache/griffin/core/job/entity/JobDataSegment.java @@ -49,7 +49,6 @@ public boolean isBaseline() { return baseline; } - @JsonProperty("as.baseline") public void setBaseline(boolean baseline) { this.baseline = baseline; } @@ -59,7 +58,6 @@ public SegmentRange getSegmentRange() { return segmentRange; } - @JsonProperty("segment.range") public void setSegmentRange(SegmentRange segmentRange) { this.segmentRange = segmentRange; } @@ -69,7 +67,6 @@ public String getDataConnectorName() { return dataConnectorName; } - @JsonProperty("data.connector.name") public void setDataConnectorName(String dataConnectorName) { if (StringUtils.isEmpty(dataConnectorName)) { LOGGER.warn(" Data connector name is invalid. Please check your connector name."); diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/JobInstanceBean.java b/service/src/main/java/org/apache/griffin/core/job/entity/JobInstanceBean.java index 32dba65d6..da2f44b07 100644 --- a/service/src/main/java/org/apache/griffin/core/job/entity/JobInstanceBean.java +++ b/service/src/main/java/org/apache/griffin/core/job/entity/JobInstanceBean.java @@ -130,7 +130,6 @@ public Long getTms() { return tms; } - @JsonProperty("timestamp") public void setTms(Long tms) { this.tms = tms; } @@ -140,7 +139,6 @@ public Long getExpireTms() { return expireTms; } - @JsonProperty("expireTimestamp") public void setExpireTms(Long expireTms) { this.expireTms = expireTms; } diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/SegmentPredicate.java b/service/src/main/java/org/apache/griffin/core/job/entity/SegmentPredicate.java index e9409a927..191a010d6 100644 --- a/service/src/main/java/org/apache/griffin/core/job/entity/SegmentPredicate.java +++ b/service/src/main/java/org/apache/griffin/core/job/entity/SegmentPredicate.java @@ -58,7 +58,6 @@ public Map getConfigMap() { return configMap; } - @JsonProperty("config") public void setConfigMap(Map configMap) { this.configMap = configMap; } diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java b/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java index 9834c6914..6227eda25 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java @@ -99,7 +99,6 @@ public List getPreProcess() { return CollectionUtils.isEmpty(preProcess) ? null : preProcess; } - @JsonProperty("pre.proc") public void setPreProcess(List preProcess) { this.preProcess = preProcess; } @@ -109,7 +108,6 @@ public Map getConfigMap() { return configMap; } - @JsonProperty("config") public void setConfigMap(Map configMap) { this.configMap = configMap; } @@ -127,7 +125,6 @@ public String getDataUnit() { return dataUnit; } - @JsonProperty("data.unit") public void setDataUnit(String dataUnit) { this.dataUnit = dataUnit; } @@ -137,7 +134,6 @@ public String getDataTimeZone() { return dataTimeZone; } - @JsonProperty("data.time.zone") public void setDataTimeZone(String dataTimeZone) { this.dataTimeZone = dataTimeZone; } diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/DataSource.java b/service/src/main/java/org/apache/griffin/core/measure/entity/DataSource.java index ca94acb1b..7c3840655 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/DataSource.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/DataSource.java @@ -87,7 +87,6 @@ public Map getCacheMap() { return cacheMap; } - @JsonProperty("cache") public void setCacheMap(Map cacheMap) { this.cacheMap = cacheMap; } diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/ExternalMeasure.java b/service/src/main/java/org/apache/griffin/core/measure/entity/ExternalMeasure.java index f29a2096b..807165312 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/ExternalMeasure.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/ExternalMeasure.java @@ -56,7 +56,6 @@ public String getMetricName() { return metricName; } - @JsonProperty("metric.name") public void setMetricName(String metricName) { this.metricName = metricName; } diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/GriffinMeasure.java b/service/src/main/java/org/apache/griffin/core/measure/entity/GriffinMeasure.java index 259957a7a..38c9c15a2 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/GriffinMeasure.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/GriffinMeasure.java @@ -80,7 +80,6 @@ public ProcessType getProcessType() { return processType; } - @JsonProperty("process.type") public void setProcessType(ProcessType processType) { this.processType = processType; } @@ -90,7 +89,6 @@ public List getDataSources() { return dataSources; } - @JsonProperty("data.sources") public void setDataSources(List dataSources) { if (CollectionUtils.isEmpty(dataSources)) { throw new NullPointerException("Data source can not be empty."); @@ -103,7 +101,6 @@ public EvaluateRule getEvaluateRule() { return evaluateRule; } - @JsonProperty("evaluate.rule") public void setEvaluateRule(EvaluateRule evaluateRule) { if (evaluateRule == null || CollectionUtils.isEmpty(evaluateRule.getRules())) { throw new NullPointerException("Evaluate rule can not be empty."); @@ -116,7 +113,6 @@ public Map getRuleDescriptionMap() { return ruleDescriptionMap; } - @JsonProperty("rule.description") public void setRuleDescriptionMap(Map ruleDescriptionMap) { this.ruleDescriptionMap = ruleDescriptionMap; } diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/Measure.java b/service/src/main/java/org/apache/griffin/core/measure/entity/Measure.java index f0363327d..232e55cd4 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/Measure.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/Measure.java @@ -64,7 +64,6 @@ public DqType getDqType() { return dqType; } - @JsonProperty("dq.type") public void setDqType(DqType dqType) { this.dqType = dqType; } diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java b/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java index 9cfc33932..2fd3cb78d 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java @@ -89,7 +89,6 @@ public String getDslType() { return dslType; } - @JsonProperty("dsl.type") public void setDslType(String dslType) { this.dslType = dslType; } @@ -99,7 +98,6 @@ public String getDqType() { return dqType; } - @JsonProperty("dq.type") public void setDqType(String dqType) { this.dqType = dqType; } @@ -117,7 +115,6 @@ public Map getDetailsMap() { return detailsMap; } - @JsonProperty("details") public void setDetailsMap(Map detailsMap) { this.detailsMap = detailsMap; } @@ -127,7 +124,6 @@ public Map getMetricMap() { return metricMap; } - @JsonProperty("metric") public void setMetricMap(Map metricMap) { this.metricMap = metricMap; } @@ -137,7 +133,6 @@ public Map getRecordMap() { return recordMap; } - @JsonProperty("record") public void setRecordMap(Map recordMap) { this.recordMap = recordMap; } diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/StreamingPreProcess.java b/service/src/main/java/org/apache/griffin/core/measure/entity/StreamingPreProcess.java index 8cdd7c0ca..a6802f691 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/StreamingPreProcess.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/StreamingPreProcess.java @@ -54,7 +54,6 @@ public String getDslType() { return dslType; } - @JsonProperty(("dsl.type")) public void setDslType(String dslType) { this.dslType = dslType; } @@ -88,7 +87,6 @@ public Map getDetailsMap() { return detailsMap; } - @JsonProperty("details") public void setDetailsMap(Map details) { this.detailsMap = details; }