You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/06/19 10:29:52 UTC
incubator-griffin git commit: clear and add serialversionuid
Repository: incubator-griffin
Updated Branches:
refs/heads/master 3937c5251 -> 130d20016
clear and add serialversionuid
clear and add serialversionuid
Author: jasonliaoxiaoge <18...@qq.com>
Closes #314 from jasonliaoxiaoge/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/130d2001
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/130d2001
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/130d2001
Branch: refs/heads/master
Commit: 130d2001659f5a74702ca66e0e10d733640fe7ae
Parents: 3937c52
Author: jasonliaoxiaoge <18...@qq.com>
Authored: Tue Jun 19 18:29:46 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Tue Jun 19 18:29:46 2018 +0800
----------------------------------------------------------------------
.../griffin/core/measure/entity/AbstractAuditableEntity.java | 5 ++---
.../org/apache/griffin/core/measure/entity/ExternalMeasure.java | 3 ++-
.../main/java/org/apache/griffin/core/measure/entity/Rule.java | 3 ++-
.../apache/griffin/core/measure/entity/StreamingPreProcess.java | 3 ++-
.../main/java/org/apache/griffin/core/metric/model/Metric.java | 2 --
.../src/main/java/org/apache/griffin/core/util/JsonUtil.java | 4 ----
6 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/130d2001/service/src/main/java/org/apache/griffin/core/measure/entity/AbstractAuditableEntity.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/AbstractAuditableEntity.java b/service/src/main/java/org/apache/griffin/core/measure/entity/AbstractAuditableEntity.java
index 4bda504..ce028f4 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/entity/AbstractAuditableEntity.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/entity/AbstractAuditableEntity.java
@@ -30,10 +30,9 @@ import java.sql.Timestamp;
@MappedSuperclass
public abstract class AbstractAuditableEntity implements Serializable {
+ private static final long serialVersionUID = -6082197561814230296L;
-// private static final long serialVersionUID = 1L;
-
- @Id
+ @Id
@GeneratedValue(strategy = GenerationType.AUTO)
protected Long id;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/130d2001/service/src/main/java/org/apache/griffin/core/measure/entity/ExternalMeasure.java
----------------------------------------------------------------------
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 4dce556..f29a209 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
@@ -33,8 +33,9 @@ import javax.persistence.OneToOne;
*/
@Entity
public class ExternalMeasure extends Measure {
+ private static final long serialVersionUID = -7551493544224747244L;
- private String metricName;
+ private String metricName;
@JsonIgnore
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/130d2001/service/src/main/java/org/apache/griffin/core/measure/entity/Rule.java
----------------------------------------------------------------------
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 ad6f7a2..9a4dd22 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
@@ -35,8 +35,9 @@ import java.util.Map;
@Entity
public class Rule extends AbstractAuditableEntity {
+ private static final long serialVersionUID = -143019093509759648L;
- /**
+ /**
* three type:1.griffin-dsl 2.df-opr 3.spark-sql
*/
@NotNull
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/130d2001/service/src/main/java/org/apache/griffin/core/measure/entity/StreamingPreProcess.java
----------------------------------------------------------------------
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 16ea870..8cdd7c0 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
@@ -33,8 +33,9 @@ import java.util.Map;
@Entity
public class StreamingPreProcess extends AbstractAuditableEntity {
+ private static final long serialVersionUID = -7471448761795495384L;
- private String dslType;
+ private String dslType;
private String name;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/130d2001/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java b/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
index d6d37e5..29a41dd 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/model/Metric.java
@@ -20,8 +20,6 @@ under the License.
package org.apache.griffin.core.metric.model;
import org.apache.griffin.core.measure.entity.DqType;
-import org.apache.griffin.core.measure.entity.Measure;
-
import java.util.List;
public class Metric {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/130d2001/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java b/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
index 4fc225f..c2e85fb 100644
--- a/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/JsonUtil.java
@@ -27,13 +27,9 @@ import com.fasterxml.jackson.databind.ObjectWriter;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.PropertiesFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Properties;
public class JsonUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(JsonUtil.class);