Repository: incubator-griffin Updated Branches: refs/heads/master e531cb2aa -> 1c39b8369
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1c39b836/service/src/main/java/org/apache/griffin/core/util/FileUtil.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/util/FileUtil.java b/service/src/main/java/org/apache/griffin/core/util/FileUtil.java index 97d65aa..99795d6 100644 --- a/service/src/main/java/org/apache/griffin/core/util/FileUtil.java +++ b/service/src/main/java/org/apache/griffin/core/util/FileUtil.java @@ -19,12 +19,12 @@ under the License. package org.apache.griffin.core.util; +import java.io.File; + import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; - public class FileUtil { private static final Logger LOGGER = LoggerFactory.getLogger(FileUtil.class); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1c39b836/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 c2e85fb..fb2afa6 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 @@ -24,13 +24,15 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.io.InputStream; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class JsonUtil { private static final Logger LOGGER = LoggerFactory.getLogger(JsonUtil.class); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1c39b836/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java b/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java index f59d614..615bbba 100644 --- a/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java +++ b/service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java @@ -19,6 +19,11 @@ under the License. package org.apache.griffin.core.util; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.apache.commons.lang.StringUtils; import org.apache.griffin.core.exception.GriffinException; import org.apache.griffin.core.measure.entity.DataSource; @@ -28,11 +33,6 @@ import org.apache.griffin.core.measure.entity.Measure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_CONNECTOR_NAME; import static org.apache.griffin.core.exception.GriffinExceptionMessage.MISSING_METRIC_NAME; http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1c39b836/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java b/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java index 90b6064..4215da0 100644 --- a/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java +++ b/service/src/main/java/org/apache/griffin/core/util/PropertiesUtil.java @@ -19,6 +19,11 @@ under the License. package org.apache.griffin.core.util; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Properties; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.PropertiesFactoryBean; @@ -26,11 +31,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Properties; - import static org.apache.griffin.core.util.FileUtil.getFilePath; public class PropertiesUtil { http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1c39b836/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java b/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java index 1a845fd..7ffb626 100644 --- a/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java +++ b/service/src/main/java/org/apache/griffin/core/util/TimeUtil.java @@ -19,9 +19,6 @@ under the License. package org.apache.griffin.core.util; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -31,6 +28,9 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class TimeUtil { private static final Logger LOGGER = LoggerFactory.getLogger(TimeUtil.class); private static final String MILLISECONDS_PATTERN = "(?i)m(illi)?s(ec(ond)?)?"; http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1c39b836/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java index e723a15..f78f205 100644 --- a/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java +++ b/service/src/main/java/org/apache/griffin/core/util/YarnNetUtil.java @@ -21,6 +21,7 @@ package org.apache.griffin.core.util; import com.google.gson.JsonObject; import com.google.gson.JsonParser; + import org.apache.commons.lang.StringUtils; import org.apache.griffin.core.job.entity.JobInstanceBean; import org.apache.griffin.core.job.entity.LivySessionStates;
