From 24b24d5a75042b2fb7e09d7549c0fd929a6a2856 Mon Sep 17 00:00:00 2001
From: jasonliaoxiaoge <181276056@qq.com>
Date: Tue, 19 Jun 2018 18:09:39 +0800
Subject: [PATCH] clear and add serialversionuid

---
 .../griffin/core/measure/entity/AbstractAuditableEntity.java | 5 ++---
 .../apache/griffin/core/measure/entity/ExternalMeasure.java  | 3 ++-
 .../java/org/apache/griffin/core/measure/entity/Rule.java    | 3 ++-
 .../griffin/core/measure/entity/StreamingPreProcess.java     | 3 ++-
 .../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(-)

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 4bda504d0..ce028f467 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 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 @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;
 
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 4dce55698..f29a2096b 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 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 @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)
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 ad6f7a2c8..9a4dd228d 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 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 @Entity
 public class Rule extends AbstractAuditableEntity {
+	private static final long serialVersionUID = -143019093509759648L;
 
-    /**
+	/**
      * three type:1.griffin-dsl 2.df-opr 3.spark-sql
      */
     @NotNull
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 16ea87039..8cdd7c0ca 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 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 @Entity
 public class StreamingPreProcess extends AbstractAuditableEntity {
+	private static final long serialVersionUID = -7471448761795495384L;
 
-    private String dslType;
+	private String dslType;
 
     private String name;
 
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 d6d37e5e8..29a41dd90 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 @@ Licensed to the Apache Software Foundation (ASF) under one
 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 {
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 4fc225fe8..c2e85fb27 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 @@ Licensed to the Apache Software Foundation (ASF) under one
 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);