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/08/07 08:25:01 UTC
[2/2] incubator-griffin git commit: Fix import violations by Griffin
code check rules
Fix import violations by Griffin code check rules
Author: Eugene <to...@163.com>
Closes #385 from toyboxman/import.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/966d831e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/966d831e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/966d831e
Branch: refs/heads/master
Commit: 966d831ed6b6e293e95ce7503c3498d6e3161027
Parents: 589c377
Author: Eugene <to...@163.com>
Authored: Tue Aug 7 16:24:53 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Tue Aug 7 16:24:53 2018 +0800
----------------------------------------------------------------------
.../griffin/core/config/PropertiesConfig.java | 18 ++--
.../core/exception/GriffinExceptionHandler.java | 4 +-
.../griffin/core/job/BatchJobOperatorImpl.java | 36 ++++---
.../griffin/core/job/FileExistPredicator.java | 6 +-
.../apache/griffin/core/job/JobController.java | 6 +-
.../apache/griffin/core/job/JobInstance.java | 26 ++---
.../org/apache/griffin/core/job/JobService.java | 2 +-
.../apache/griffin/core/job/JobServiceImpl.java | 56 +++++-----
.../apache/griffin/core/job/SparkSubmitJob.java | 28 ++---
.../core/job/StreamingJobOperatorImpl.java | 26 ++---
.../griffin/core/job/entity/AbstractJob.java | 2 +-
.../griffin/core/job/entity/BatchJob.java | 6 +-
.../griffin/core/job/entity/JobDataSegment.java | 4 +-
.../griffin/core/job/entity/JobHealth.java | 2 +-
.../core/job/entity/JobInstanceBean.java | 12 ++-
.../core/job/entity/LivySessionStates.java | 8 +-
.../core/job/entity/SegmentPredicate.java | 4 +-
.../griffin/core/job/entity/SegmentRange.java | 4 +-
.../griffin/core/job/entity/StreamingJob.java | 4 +-
.../core/job/factory/PredicatorFactory.java | 1 +
.../griffin/core/job/repo/JobInstanceRepo.java | 4 +-
.../measure/ExternalMeasureOperatorImpl.java | 4 +-
.../measure/GriffinMeasureOperatorImpl.java | 4 +-
.../griffin/core/measure/MeasureController.java | 2 +-
.../core/measure/MeasureOrgServiceImpl.java | 6 +-
.../core/measure/MeasureServiceImpl.java | 10 +-
.../measure/entity/AbstractAuditableEntity.java | 4 +-
.../core/measure/entity/ExternalMeasure.java | 4 +-
.../core/measure/entity/GriffinMeasure.java | 2 +-
.../griffin/core/measure/entity/Rule.java | 4 +-
.../measure/entity/StreamingPreProcess.java | 4 +-
.../griffin/core/measure/repo/MeasureRepo.java | 8 +-
.../metastore/kafka/KafkaSchemaServiceImpl.java | 2 +-
.../griffin/core/metric/MetricServiceImpl.java | 12 +--
.../griffin/core/metric/MetricStoreImpl.java | 16 +--
.../org/apache/griffin/core/util/FSUtil.java | 14 +--
.../apache/griffin/core/util/MeasureUtil.java | 6 +-
.../griffin/core/util/PropertiesUtil.java | 4 +-
.../config/EclipseLinkJpaConfigForTest.java | 8 +-
.../core/config/PropertiesConfigTest.java | 8 +-
.../core/info/GriffinInfoControllerTest.java | 10 +-
.../core/job/FileExistPredicatorTest.java | 105 ++++++++++---------
.../griffin/core/job/JobControllerTest.java | 30 +++---
.../core/job/JobInstanceBeanRepoTest.java | 26 ++---
.../griffin/core/job/JobInstanceTest.java | 30 ++++--
.../griffin/core/job/SparkSubmitJobTest.java | 20 ++--
.../core/job/repo/JobInstanceRepoTest.java | 68 ++++++------
.../griffin/core/job/repo/JobRepoTest.java | 8 +-
.../ExternalMeasureOperatorImplTest.java | 10 +-
.../measure/GriffinMeasureOperatorImplTest.java | 15 +--
.../core/measure/MeasureControllerTest.java | 31 +++---
.../core/measure/MeasureOrgControllerTest.java | 24 ++---
.../core/measure/MeasureOrgServiceImplTest.java | 22 ++--
.../core/measure/MeasureServiceImplTest.java | 31 +++---
.../measure/repo/DataConnectorRepoTest.java | 14 +--
.../core/measure/repo/MeasureRepoTest.java | 10 +-
.../hive/HiveMetaStoreControllerTest.java | 22 ++--
.../hive/HiveMetaStoreServiceImplTest.java | 16 +--
.../kafka/KafkaSchemaControllerTest.java | 32 +++---
.../kafka/KafkaSchemaServiceImplTest.java | 34 +++---
.../core/metric/MetricControllerTest.java | 30 +++---
.../core/metric/MetricServiceImplTest.java | 24 ++---
.../core/metric/MetricStoreImplTest.java | 5 +-
.../apache/griffin/core/util/EntityHelper.java | 48 ++++++---
.../apache/griffin/core/util/JsonUtilTest.java | 11 +-
.../griffin/core/util/PropertiesUtilTest.java | 10 +-
.../apache/griffin/core/util/TimeUtilTest.java | 8 +-
67 files changed, 567 insertions(+), 508 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/config/PropertiesConfig.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/config/PropertiesConfig.java b/service/src/main/java/org/apache/griffin/core/config/PropertiesConfig.java
index 9cd35a9..16e5525 100644
--- a/service/src/main/java/org/apache/griffin/core/config/PropertiesConfig.java
+++ b/service/src/main/java/org/apache/griffin/core/config/PropertiesConfig.java
@@ -19,6 +19,12 @@ under the License.
package org.apache.griffin.core.config;
+import static org.apache.griffin.core.config.EnvConfig.getBatchEnv;
+import static org.apache.griffin.core.config.EnvConfig.getStreamingEnv;
+import static org.apache.griffin.core.util.JsonUtil.toEntity;
+import static org.apache.griffin.core.util.PropertiesUtil.getConf;
+import static org.apache.griffin.core.util.PropertiesUtil.getConfPath;
+
import com.fasterxml.jackson.core.type.TypeReference;
import java.io.FileInputStream;
@@ -36,18 +42,12 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
-import static org.apache.griffin.core.config.EnvConfig.getBatchEnv;
-import static org.apache.griffin.core.config.EnvConfig.getStreamingEnv;
-import static org.apache.griffin.core.util.JsonUtil.toEntity;
-import static org.apache.griffin.core.util.PropertiesUtil.getConf;
-import static org.apache.griffin.core.util.PropertiesUtil.getConfPath;
-
@Configuration
public class PropertiesConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(PropertiesConfig.class);
- public static Map<String,Object> livyConfMap;
+ public static Map<String, Object> livyConfMap;
private String configLocation;
@@ -106,7 +106,7 @@ public class PropertiesConfig {
* @return Map
* @throws IOException io exception
*/
- private static Map<String,Object> readPropertiesFromResource(String path) throws IOException {
+ private static Map<String, Object> readPropertiesFromResource(String path) throws IOException {
if (path == null) {
LOGGER.warn("Parameter path is null.");
return null;
@@ -114,7 +114,7 @@ public class PropertiesConfig {
// Be careful, here we use getInputStream() to convert path file to stream.
// It'll cause FileNotFoundException if you use getFile() to convert path file to File Object
InputStream in = new ClassPathResource(path).getInputStream();
- return toEntity(in, new TypeReference<Map<String,Object> >() {
+ return toEntity(in, new TypeReference<Map<String, Object>>() {
});
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionHandler.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionHandler.java b/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionHandler.java
index 3328281..0a105b4 100644
--- a/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionHandler.java
+++ b/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionHandler.java
@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
public class GriffinExceptionHandler {
@SuppressWarnings("rawtypes")
- @ExceptionHandler(GriffinException.ServiceException.class)
+ @ExceptionHandler(GriffinException.ServiceException.class)
public ResponseEntity handleGriffinExceptionOfServer(HttpServletRequest request, GriffinException.ServiceException e) {
String message = e.getMessage();
Throwable cause = e.getCause();
@@ -42,7 +42,7 @@ public class GriffinExceptionHandler {
}
@SuppressWarnings("rawtypes")
- @ExceptionHandler(GriffinException.class)
+ @ExceptionHandler(GriffinException.class)
public ResponseEntity handleGriffinExceptionOfClient(HttpServletRequest request, GriffinException e) {
ResponseStatus responseStatus = AnnotationUtils.findAnnotation(e.getClass(), ResponseStatus.class);
HttpStatus status = responseStatus.code();
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java b/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java
index df651bc..41f5142 100644
--- a/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/job/BatchJobOperatorImpl.java
@@ -1,5 +1,21 @@
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_CONNECTOR_NAME;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_CRON_EXPRESSION;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_JOB_NAME;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_IS_NOT_IN_PAUSED_STATUS;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_IS_NOT_SCHEDULED;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_KEY_DOES_NOT_EXIST;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.MISSING_BASELINE_CONFIG;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
+import static org.quartz.CronExpression.isValidExpression;
+import static org.quartz.JobKey.jobKey;
+import static org.quartz.Trigger.TriggerState;
+import static org.quartz.Trigger.TriggerState.BLOCKED;
+import static org.quartz.Trigger.TriggerState.NORMAL;
+import static org.quartz.Trigger.TriggerState.PAUSED;
+import static org.quartz.TriggerKey.triggerKey;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -33,22 +49,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_CONNECTOR_NAME;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_CRON_EXPRESSION;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_JOB_NAME;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_IS_NOT_IN_PAUSED_STATUS;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_IS_NOT_SCHEDULED;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_KEY_DOES_NOT_EXIST;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.MISSING_BASELINE_CONFIG;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
-import static org.quartz.CronExpression.isValidExpression;
-import static org.quartz.JobKey.jobKey;
-import static org.quartz.Trigger.TriggerState;
-import static org.quartz.Trigger.TriggerState.BLOCKED;
-import static org.quartz.Trigger.TriggerState.NORMAL;
-import static org.quartz.Trigger.TriggerState.PAUSED;
-import static org.quartz.TriggerKey.triggerKey;
-
@Service
public class BatchJobOperatorImpl implements JobOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(BatchJobOperatorImpl.class);
@@ -76,7 +76,7 @@ public class BatchJobOperatorImpl implements JobOperator {
}
private BatchJob genBatchJobBean(AbstractJob job, String qName, String qGroup) {
- BatchJob batchJob = (BatchJob)job;
+ BatchJob batchJob = (BatchJob) job;
batchJob.setMetricName(job.getJobName());
batchJob.setGroup(qGroup);
batchJob.setName(qName);
@@ -165,6 +165,7 @@ public class BatchJobOperatorImpl implements JobOperator {
/**
* only PAUSED state of job can be started
+ *
* @param state job state
* @return true: job can be started, false: job is running which cannot be started
*/
@@ -174,6 +175,7 @@ public class BatchJobOperatorImpl implements JobOperator {
/**
* only NORMAL or BLOCKED state of job can be started
+ *
* @param state job state
* @return true: job can be stopped, false: job is running which cannot be stopped
*/
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/FileExistPredicator.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/FileExistPredicator.java b/service/src/main/java/org/apache/griffin/core/job/FileExistPredicator.java
index 9446418..35f981f 100644
--- a/service/src/main/java/org/apache/griffin/core/job/FileExistPredicator.java
+++ b/service/src/main/java/org/apache/griffin/core/job/FileExistPredicator.java
@@ -19,6 +19,8 @@ under the License.
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.job.JobInstance.PATH_CONNECTOR_CHARACTER;
+
import java.io.IOException;
import java.util.Map;
@@ -29,8 +31,6 @@ import org.apache.griffin.core.util.FSUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.griffin.core.job.JobInstance.PATH_CONNECTOR_CHARACTER;
-
public class FileExistPredicator implements Predicator {
private static final Logger LOGGER = LoggerFactory.getLogger(FileExistPredicator.class);
@@ -49,7 +49,7 @@ public class FileExistPredicator implements Predicator {
String[] paths = null;
String rootPath = null;
if (config != null && !StringUtils.isEmpty((String) config.get(PREDICT_PATH))) {
- paths = ((String)config.get(PREDICT_PATH)).split(PATH_CONNECTOR_CHARACTER);
+ paths = ((String) config.get(PREDICT_PATH)).split(PATH_CONNECTOR_CHARACTER);
rootPath = (String) config.get(PREDICT_ROOT_PATH);
}
if (ArrayUtils.isEmpty(paths) || StringUtils.isEmpty(rootPath)) {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/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 d03e4ea..ebfdd91 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
@@ -66,7 +66,7 @@ public class JobController {
@RequestMapping(value = "/jobs/{id}", method = RequestMethod.PUT)
@ResponseStatus(HttpStatus.OK)
public AbstractJob onActions(@PathVariable("id") Long jobId, @RequestParam String action) throws Exception {
- return jobService.onAction(jobId,action);
+ return jobService.onAction(jobId, action);
}
@RequestMapping(value = "/jobs", method = RequestMethod.DELETE)
@@ -92,8 +92,8 @@ public class JobController {
}
@RequestMapping(path = "/jobs/download", method = RequestMethod.GET)
- public ResponseEntity<Resource> download(@RequestParam("jobName") String jobName ,@RequestParam("ts") long timestamp) throws Exception {
- String path = jobService.getJobHdfsPersistPath(jobName,timestamp);
+ public ResponseEntity<Resource> download(@RequestParam("jobName") String jobName, @RequestParam("ts") long timestamp) throws Exception {
+ String path = jobService.getJobHdfsPersistPath(jobName, timestamp);
InputStreamResource resource = new InputStreamResource(FSUtil.getMissSampleInputStream(path));
return ResponseEntity.ok().
header("content-disposition", "attachment; filename = sampleMissingData.json")
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/JobInstance.java b/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
index f8776b1..18a5a96 100644
--- a/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
+++ b/service/src/main/java/org/apache/griffin/core/job/JobInstance.java
@@ -19,6 +19,19 @@ under the License.
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.QUARTZ_JOB_ALREADY_EXIST;
+import static org.apache.griffin.core.job.JobServiceImpl.GRIFFIN_JOB_ID;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.FINDING;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.STREAMING;
+import static org.apache.griffin.core.util.JsonUtil.toEntity;
+import static org.apache.griffin.core.util.JsonUtil.toJson;
+import static org.quartz.JobBuilder.newJob;
+import static org.quartz.JobKey.jobKey;
+import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
+import static org.quartz.TriggerBuilder.newTrigger;
+import static org.quartz.TriggerKey.triggerKey;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
@@ -62,19 +75,6 @@ import org.springframework.core.env.Environment;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.transaction.annotation.Transactional;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.QUARTZ_JOB_ALREADY_EXIST;
-import static org.apache.griffin.core.job.JobServiceImpl.GRIFFIN_JOB_ID;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.FINDING;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.STREAMING;
-import static org.apache.griffin.core.util.JsonUtil.toEntity;
-import static org.apache.griffin.core.util.JsonUtil.toJson;
-import static org.quartz.JobBuilder.newJob;
-import static org.quartz.JobKey.jobKey;
-import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
-import static org.quartz.TriggerBuilder.newTrigger;
-import static org.quartz.TriggerKey.triggerKey;
-
@PersistJobDataAfterExecution
@DisallowConcurrentExecution
public class JobInstance implements Job {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/JobService.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/JobService.java b/service/src/main/java/org/apache/griffin/core/job/JobService.java
index 0d8f91e..65766e2 100644
--- a/service/src/main/java/org/apache/griffin/core/job/JobService.java
+++ b/service/src/main/java/org/apache/griffin/core/job/JobService.java
@@ -34,7 +34,7 @@ public interface JobService {
AbstractJob getJobConfig(Long jobId);
- AbstractJob onAction(Long jobId,String action) throws Exception;
+ AbstractJob onAction(Long jobId, String action) throws Exception;
void deleteJob(Long jobId) throws SchedulerException;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java b/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
index 8e95551..b041c0b 100644
--- a/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/job/JobServiceImpl.java
@@ -19,6 +19,34 @@ under the License.
package org.apache.griffin.core.job;
+import static java.util.TimeZone.getTimeZone;
+import static org.apache.griffin.core.config.EnvConfig.ENV_BATCH;
+import static org.apache.griffin.core.config.EnvConfig.ENV_STREAMING;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_MEASURE_ID;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_ID_DOES_NOT_EXIST;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_NAME_DOES_NOT_EXIST;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_TYPE_DOES_NOT_SUPPORT;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_TYPE_DOES_NOT_SUPPORT;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.NO_SUCH_JOB_ACTION;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.QUARTZ_JOB_ALREADY_EXIST;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.BUSY;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.DEAD;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.IDLE;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.NOT_STARTED;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.RECOVERING;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.RUNNING;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.STARTING;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.UNKNOWN;
+import static org.apache.griffin.core.job.entity.LivySessionStates.isActive;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.STREAMING;
+import static org.quartz.CronScheduleBuilder.cronSchedule;
+import static org.quartz.JobBuilder.newJob;
+import static org.quartz.JobKey.jobKey;
+import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
+import static org.quartz.TriggerBuilder.newTrigger;
+import static org.quartz.TriggerKey.triggerKey;
+
import com.fasterxml.jackson.core.type.TypeReference;
import java.util.ArrayList;
@@ -71,34 +99,6 @@ import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
-import static java.util.TimeZone.getTimeZone;
-import static org.apache.griffin.core.config.EnvConfig.ENV_BATCH;
-import static org.apache.griffin.core.config.EnvConfig.ENV_STREAMING;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_MEASURE_ID;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_ID_DOES_NOT_EXIST;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_NAME_DOES_NOT_EXIST;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_TYPE_DOES_NOT_SUPPORT;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_TYPE_DOES_NOT_SUPPORT;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.NO_SUCH_JOB_ACTION;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.QUARTZ_JOB_ALREADY_EXIST;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.BUSY;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.DEAD;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.IDLE;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.NOT_STARTED;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.RECOVERING;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.RUNNING;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.STARTING;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.UNKNOWN;
-import static org.apache.griffin.core.job.entity.LivySessionStates.isActive;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.STREAMING;
-import static org.quartz.CronScheduleBuilder.cronSchedule;
-import static org.quartz.JobBuilder.newJob;
-import static org.quartz.JobKey.jobKey;
-import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
-import static org.quartz.TriggerBuilder.newTrigger;
-import static org.quartz.TriggerKey.triggerKey;
-
@Service
public class JobServiceImpl implements JobService {
private static final Logger LOGGER = LoggerFactory.getLogger(JobServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
index 52c911c..19e746f 100644
--- a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
@@ -19,6 +19,19 @@ under the License.
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.config.EnvConfig.ENV_BATCH;
+import static org.apache.griffin.core.config.EnvConfig.ENV_STREAMING;
+import static org.apache.griffin.core.config.PropertiesConfig.livyConfMap;
+import static org.apache.griffin.core.job.JobInstance.JOB_NAME;
+import static org.apache.griffin.core.job.JobInstance.MEASURE_KEY;
+import static org.apache.griffin.core.job.JobInstance.PREDICATES_KEY;
+import static org.apache.griffin.core.job.JobInstance.PREDICATE_JOB_NAME;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.FOUND;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.NOT_FOUND;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
+import static org.apache.griffin.core.util.JsonUtil.toEntity;
+
import com.fasterxml.jackson.core.type.TypeReference;
import java.io.IOException;
@@ -51,19 +64,6 @@ import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
-import static org.apache.griffin.core.config.EnvConfig.ENV_BATCH;
-import static org.apache.griffin.core.config.EnvConfig.ENV_STREAMING;
-import static org.apache.griffin.core.config.PropertiesConfig.livyConfMap;
-import static org.apache.griffin.core.job.JobInstance.JOB_NAME;
-import static org.apache.griffin.core.job.JobInstance.MEASURE_KEY;
-import static org.apache.griffin.core.job.JobInstance.PREDICATES_KEY;
-import static org.apache.griffin.core.job.JobInstance.PREDICATE_JOB_NAME;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.FOUND;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.NOT_FOUND;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
-import static org.apache.griffin.core.util.JsonUtil.toEntity;
-
@PersistJobDataAfterExecution
@DisallowConcurrentExecution
@Component
@@ -149,7 +149,7 @@ public class SparkSubmitJob implements Job {
measure.setName(jd.getJobDataMap().getString(JOB_NAME));
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void setPredicates(String json) throws IOException {
if (StringUtils.isEmpty(json)) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/StreamingJobOperatorImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/StreamingJobOperatorImpl.java b/service/src/main/java/org/apache/griffin/core/job/StreamingJobOperatorImpl.java
index e40807b..adabc28 100644
--- a/service/src/main/java/org/apache/griffin/core/job/StreamingJobOperatorImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/job/StreamingJobOperatorImpl.java
@@ -19,6 +19,16 @@ under the License.
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_JOB_NAME;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.STREAMING_JOB_IS_RUNNING;
+import static org.apache.griffin.core.job.JobServiceImpl.START;
+import static org.apache.griffin.core.job.JobServiceImpl.STOP;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.STOPPED;
+import static org.apache.griffin.core.job.entity.LivySessionStates.convert2QuartzState;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.STREAMING;
+import static org.quartz.TriggerKey.triggerKey;
+
import java.util.List;
import javax.annotation.PostConstruct;
@@ -48,16 +58,6 @@ import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_JOB_NAME;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.STREAMING_JOB_IS_RUNNING;
-import static org.apache.griffin.core.job.JobServiceImpl.START;
-import static org.apache.griffin.core.job.JobServiceImpl.STOP;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.STOPPED;
-import static org.apache.griffin.core.job.entity.LivySessionStates.convert2QuartzState;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.STREAMING;
-import static org.quartz.TriggerKey.triggerKey;
-
@Service
public class StreamingJobOperatorImpl implements JobOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(StreamingJobOperatorImpl.class);
@@ -90,12 +90,12 @@ public class StreamingJobOperatorImpl implements JobOperator {
TriggerKey triggerKey = jobService.getTriggerKeyIfValid(qName, qGroup);
StreamingJob streamingJob = genStreamingJobBean(job, qName, qGroup);
streamingJob = streamingJobRepo.save(streamingJob);
- jobService.addJob(triggerKey,streamingJob, STREAMING);
+ jobService.addJob(triggerKey, streamingJob, STREAMING);
return streamingJob;
}
private StreamingJob genStreamingJobBean(AbstractJob job, String qName, String qGroup) {
- StreamingJob streamingJob = (StreamingJob)job;
+ StreamingJob streamingJob = (StreamingJob) job;
streamingJob.setMetricName(job.getJobName());
streamingJob.setGroup(qGroup);
streamingJob.setName(qName);
@@ -117,7 +117,7 @@ public class StreamingJobOperatorImpl implements JobOperator {
String qName = jobService.getQuartzName(job);
String qGroup = jobService.getQuartzGroup();
TriggerKey triggerKey = triggerKey(qName, qGroup);
- jobService.addJob(triggerKey,streamingJob, STREAMING);
+ jobService.addJob(triggerKey, streamingJob, STREAMING);
}
private void verifyJobState(AbstractJob job) throws SchedulerException {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/AbstractJob.java
----------------------------------------------------------------------
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 e8b8f8a..9d78480 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
@@ -242,7 +242,7 @@ public abstract class AbstractJob extends AbstractAuditableEntity {
this.deleted = deleted;
}
- AbstractJob(Long measureId, String jobName, String cronExpression, String timeZone,List<JobDataSegment> segments, boolean deleted) {
+ AbstractJob(Long measureId, String jobName, String cronExpression, String timeZone, List<JobDataSegment> segments, boolean deleted) {
this.measureId = measureId;
this.jobName = jobName;
this.metricName = jobName;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/BatchJob.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/BatchJob.java b/service/src/main/java/org/apache/griffin/core/job/entity/BatchJob.java
index 727bb1c..72a04bd 100644
--- a/service/src/main/java/org/apache/griffin/core/job/entity/BatchJob.java
+++ b/service/src/main/java/org/apache/griffin/core/job/entity/BatchJob.java
@@ -26,9 +26,9 @@ import javax.persistence.Entity;
@Entity
@DiscriminatorValue("griffinBatchJob")
public class BatchJob extends AbstractJob {
- private static final long serialVersionUID = -1114269860236729008L;
+ private static final long serialVersionUID = -1114269860236729008L;
- @Override
+ @Override
public String getType() {
return JobType.BATCH.getName();
}
@@ -48,7 +48,7 @@ public class BatchJob extends AbstractJob {
}
public BatchJob(Long measureId, String jobName, String cronExpression, String timeZone, List<JobDataSegment> segments, boolean deleted) {
- super(measureId, jobName, cronExpression, timeZone,segments, deleted);
+ super(measureId, jobName, cronExpression, timeZone, segments, deleted);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/JobDataSegment.java
----------------------------------------------------------------------
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 55bd526..62abe3e 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
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
@Entity
public class JobDataSegment extends AbstractAuditableEntity {
- private static final long serialVersionUID = -9056531122243340484L;
+ private static final long serialVersionUID = -9056531122243340484L;
- private static final Logger LOGGER = LoggerFactory.getLogger(JobDataSegment.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JobDataSegment.class);
@NotNull
private String dataConnectorName;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/JobHealth.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/JobHealth.java b/service/src/main/java/org/apache/griffin/core/job/entity/JobHealth.java
index e0ecc90..e44901e 100644
--- a/service/src/main/java/org/apache/griffin/core/job/entity/JobHealth.java
+++ b/service/src/main/java/org/apache/griffin/core/job/entity/JobHealth.java
@@ -43,7 +43,7 @@ public class JobHealth {
this.healthyJobCount = healthyJobCount;
this.jobCount = jobCount;
}
-
+
public JobHealth() {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/JobInstanceBean.java
----------------------------------------------------------------------
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 92740d5..f630b84 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
@@ -19,6 +19,8 @@ under the License.
package org.apache.griffin.core.job.entity;
+import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -34,8 +36,6 @@ import org.apache.griffin.core.job.entity.LivySessionStates.State;
import org.apache.griffin.core.measure.entity.AbstractAuditableEntity;
import org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType;
-import static org.apache.griffin.core.measure.entity.GriffinMeasure.ProcessType.BATCH;
-
@Entity
public class JobInstanceBean extends AbstractAuditableEntity {
@@ -49,7 +49,9 @@ public class JobInstanceBean extends AbstractAuditableEntity {
@Enumerated(EnumType.STRING)
private ProcessType type = BATCH;
- /** The application id of this session **/
+ /**
+ * The application id of this session
+ **/
@JsonInclude(JsonInclude.Include.NON_NULL)
private String appId;
@@ -79,7 +81,7 @@ public class JobInstanceBean extends AbstractAuditableEntity {
private boolean deleted = false;
@ManyToOne
- @JoinColumn(name = "job_id",nullable = false)
+ @JoinColumn(name = "job_id", nullable = false)
@JsonIgnore
private AbstractJob job;
@@ -198,7 +200,7 @@ public class JobInstanceBean extends AbstractAuditableEntity {
this.expireTms = expireTms;
}
- public JobInstanceBean(State state, String pName, String pGroup, Long tms, Long expireTms,AbstractJob job) {
+ public JobInstanceBean(State state, String pName, String pGroup, Long tms, Long expireTms, AbstractJob job) {
this(state, pName, pGroup, tms, expireTms);
this.job = job;
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/LivySessionStates.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/LivySessionStates.java b/service/src/main/java/org/apache/griffin/core/job/entity/LivySessionStates.java
index 817d6b0..e4a7cd3 100644
--- a/service/src/main/java/org/apache/griffin/core/job/entity/LivySessionStates.java
+++ b/service/src/main/java/org/apache/griffin/core/job/entity/LivySessionStates.java
@@ -19,10 +19,6 @@ under the License.
package org.apache.griffin.core.job.entity;
-import com.cloudera.livy.sessions.SessionState;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
import static org.apache.griffin.core.job.entity.LivySessionStates.State.DEAD;
import static org.apache.griffin.core.job.entity.LivySessionStates.State.FINDING;
import static org.apache.griffin.core.job.entity.LivySessionStates.State.FOUND;
@@ -35,6 +31,10 @@ import static org.apache.griffin.core.job.entity.LivySessionStates.State.STOPPED
import static org.apache.griffin.core.job.entity.LivySessionStates.State.SUCCESS;
import static org.apache.griffin.core.job.entity.LivySessionStates.State.UNKNOWN;
+import com.cloudera.livy.sessions.SessionState;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
public class LivySessionStates {
/**
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/SegmentPredicate.java
----------------------------------------------------------------------
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 5cd11e4..2f7a807 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
@@ -40,9 +40,9 @@ import org.apache.griffin.core.util.JsonUtil;
@Entity
public class SegmentPredicate extends AbstractAuditableEntity {
- private static final long serialVersionUID = 1942715275465116154L;
+ private static final long serialVersionUID = 1942715275465116154L;
- private String type;
+ private String type;
@JsonIgnore
private String config;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/SegmentRange.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/SegmentRange.java b/service/src/main/java/org/apache/griffin/core/job/entity/SegmentRange.java
index 0fdc07c..f9fcc72 100644
--- a/service/src/main/java/org/apache/griffin/core/job/entity/SegmentRange.java
+++ b/service/src/main/java/org/apache/griffin/core/job/entity/SegmentRange.java
@@ -28,9 +28,9 @@ import org.apache.griffin.core.measure.entity.AbstractAuditableEntity;
@Entity
public class SegmentRange extends AbstractAuditableEntity {
- private static final long serialVersionUID = -8929713841303669564L;
+ private static final long serialVersionUID = -8929713841303669564L;
- @Column(name = "data_begin")
+ @Column(name = "data_begin")
private String begin = "-1h";
private String length = "1h";
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/entity/StreamingJob.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/entity/StreamingJob.java b/service/src/main/java/org/apache/griffin/core/job/entity/StreamingJob.java
index 2542dbe..f8a8339 100644
--- a/service/src/main/java/org/apache/griffin/core/job/entity/StreamingJob.java
+++ b/service/src/main/java/org/apache/griffin/core/job/entity/StreamingJob.java
@@ -25,9 +25,9 @@ import javax.persistence.Entity;
@Entity
@DiscriminatorValue("griffinStreamingJob")
public class StreamingJob extends AbstractJob {
- private static final long serialVersionUID = 3292253488392308505L;
+ private static final long serialVersionUID = 3292253488392308505L;
- @Override
+ @Override
public String getType() {
return JobType.STREAMING.getName();
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java b/service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
index 3aa7403..5821467 100644
--- a/service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
+++ b/service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
public class PredicatorFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(PredicatorFactory.class);
+
public static Predicator newPredicateInstance(SegmentPredicate segPredicate) {
Predicator predicate = null;
switch (segPredicate.getType()) {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/job/repo/JobInstanceRepo.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/repo/JobInstanceRepo.java b/service/src/main/java/org/apache/griffin/core/job/repo/JobInstanceRepo.java
index 513e08d..52f4e10 100644
--- a/service/src/main/java/org/apache/griffin/core/job/repo/JobInstanceRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/job/repo/JobInstanceRepo.java
@@ -18,6 +18,8 @@ under the License.
*/
package org.apache.griffin.core.job.repo;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State;
+
import java.util.List;
import org.apache.griffin.core.job.entity.JobInstanceBean;
@@ -27,8 +29,6 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.transaction.annotation.Transactional;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State;
-
public interface JobInstanceRepo extends CrudRepository<JobInstanceBean, Long> {
JobInstanceBean findByPredicateName(String name);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImpl.java b/service/src/main/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImpl.java
index 3ab346e..cb897eb 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/ExternalMeasureOperatorImpl.java
@@ -19,6 +19,8 @@ under the License.
package org.apache.griffin.core.measure;
+import static org.apache.griffin.core.util.MeasureUtil.validateMeasure;
+
import org.apache.griffin.core.job.entity.VirtualJob;
import org.apache.griffin.core.job.repo.VirtualJobRepo;
import org.apache.griffin.core.measure.entity.ExternalMeasure;
@@ -28,8 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import static org.apache.griffin.core.util.MeasureUtil.validateMeasure;
-
@Component("externalOperation")
public class ExternalMeasureOperatorImpl implements MeasureOperator {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImpl.java b/service/src/main/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImpl.java
index b1aa37d..6fddd77 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/GriffinMeasureOperatorImpl.java
@@ -19,6 +19,8 @@ under the License.
package org.apache.griffin.core.measure;
+import static org.apache.griffin.core.util.MeasureUtil.validateMeasure;
+
import org.apache.griffin.core.job.JobServiceImpl;
import org.apache.griffin.core.measure.entity.Measure;
import org.apache.griffin.core.measure.repo.MeasureRepo;
@@ -26,8 +28,6 @@ import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import static org.apache.griffin.core.util.MeasureUtil.validateMeasure;
-
@Component("griffinOperation")
public class GriffinMeasureOperatorImpl implements MeasureOperator {
private final MeasureRepo<Measure> measureRepo;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/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 ef3e467..f2d0462 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
@@ -69,7 +69,7 @@ public class MeasureController {
}
@RequestMapping(value = "/measures/owner/{owner}", method = RequestMethod.GET)
- public List<Measure> getAliveMeasuresByOwner(@PathVariable("owner") @Valid String owner) {
+ public List<Measure> getAliveMeasuresByOwner(@PathVariable("owner") @Valid String owner) {
return measureService.getAliveMeasuresByOwner(owner);
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java
index 192a655..9a48edd 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java
@@ -19,6 +19,8 @@ under the License.
package org.apache.griffin.core.measure;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.ORGANIZATION_NAME_DOES_NOT_EXIST;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -32,8 +34,6 @@ import org.apache.griffin.core.measure.repo.GriffinMeasureRepo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.ORGANIZATION_NAME_DOES_NOT_EXIST;
-
@Service
public class MeasureOrgServiceImpl implements MeasureOrgService {
@@ -47,7 +47,7 @@ public class MeasureOrgServiceImpl implements MeasureOrgService {
@Override
public List<String> getMetricNameListByOrg(String org) {
- List<String> orgs = measureRepo.findNameByOrganization(org, false);
+ List<String> orgs = measureRepo.findNameByOrganization(org, false);
if (CollectionUtils.isEmpty(orgs)) {
throw new GriffinException.NotFoundException(ORGANIZATION_NAME_DOES_NOT_EXIST);
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
index a1d543a..425593b 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
@@ -20,6 +20,11 @@ under the License.
package org.apache.griffin.core.measure;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_ID_DOES_NOT_EXIST;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_NAME_ALREADY_EXIST;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_TYPE_DOES_NOT_MATCH;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_TYPE_DOES_NOT_SUPPORT;
+
import java.util.List;
import org.apache.griffin.core.exception.GriffinException;
@@ -37,11 +42,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_ID_DOES_NOT_EXIST;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_NAME_ALREADY_EXIST;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_TYPE_DOES_NOT_MATCH;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.MEASURE_TYPE_DOES_NOT_SUPPORT;
-
@Service
public class MeasureServiceImpl implements MeasureService {
private static final Logger LOGGER = LoggerFactory.getLogger(MeasureServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/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 c26b30a..cb5a399 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
@@ -31,9 +31,9 @@ import javax.persistence.MappedSuperclass;
@MappedSuperclass
public abstract class AbstractAuditableEntity implements Serializable {
- private static final long serialVersionUID = 4161638281338218249L;
+ private static final long serialVersionUID = 4161638281338218249L;
- @Id
+ @Id
@GeneratedValue(strategy = GenerationType.AUTO)
protected Long id;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/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 4ba9e52..da23bc1 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
@@ -34,9 +34,9 @@ import org.apache.griffin.core.job.entity.VirtualJob;
*/
@Entity
public class ExternalMeasure extends Measure {
- private static final long serialVersionUID = -7551493544224747244L;
+ 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/966d831e/service/src/main/java/org/apache/griffin/core/measure/entity/GriffinMeasure.java
----------------------------------------------------------------------
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 e003acb..6dd3172 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
@@ -63,7 +63,7 @@ public class GriffinMeasure extends Measure {
@Enumerated(EnumType.STRING)
private ProcessType processType;
- private static final long serialVersionUID = -475176898459647661L;
+ private static final long serialVersionUID = -475176898459647661L;
@Transient
@JsonInclude(JsonInclude.Include.NON_NULL)
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/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 8e8e539..033af2e 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
@@ -41,9 +41,9 @@ import org.apache.griffin.core.util.JsonUtil;
@Entity
public class Rule extends AbstractAuditableEntity {
- private static final long serialVersionUID = -143019093509759648L;
+ 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/966d831e/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 93678e7..9902c14 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
@@ -39,9 +39,9 @@ import org.springframework.util.StringUtils;
@Entity
public class StreamingPreProcess extends AbstractAuditableEntity {
- private static final long serialVersionUID = -7471448761795495384L;
+ 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/966d831e/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
index c5d94d2..eb24b1d 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java
@@ -26,15 +26,13 @@ import org.apache.griffin.core.measure.entity.Measure;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
-import java.util.List;
-
/**
* Interface to access measure repository
*
* @param <T> Measure and its subclass
*/
public interface MeasureRepo<T extends Measure>
- extends CrudRepository<T, Long> {
+ extends CrudRepository<T, Long> {
/**
* search repository by name and deletion state
@@ -78,7 +76,7 @@ public interface MeasureRepo<T extends Measure>
* @return organization collection
*/
@Query("select DISTINCT m.organization from #{#entityName} m "
- + "where m.deleted = ?1 and m.organization is not null")
+ + "where m.deleted = ?1 and m.organization is not null")
List<String> findOrganizations(Boolean deleted);
/**
@@ -89,6 +87,6 @@ public interface MeasureRepo<T extends Measure>
* @return organization collection
*/
@Query("select m.name from #{#entityName} m "
- + "where m.organization= ?1 and m.deleted= ?2")
+ + "where m.organization= ?1 and m.deleted= ?2")
List<String> findNameByOrganization(String organization, Boolean deleted);
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImpl.java b/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImpl.java
index bb5c837..c276e70 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImpl.java
@@ -45,7 +45,7 @@ public class KafkaSchemaServiceImpl implements KafkaSchemaService {
private String registryUrl(final String path) {
if (StringUtils.hasText(path)) {
String usePath = path;
- if (!path.startsWith("/")){
+ if (!path.startsWith("/")) {
usePath = "/" + path;
}
return this.url + usePath;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java b/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
index 72bc4cd..d6da5e4 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricServiceImpl.java
@@ -20,6 +20,10 @@ under the License.
package org.apache.griffin.core.metric;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_METRIC_RECORDS_OFFSET;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_METRIC_RECORDS_SIZE;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_METRIC_VALUE_FORMAT;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -44,10 +48,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_METRIC_RECORDS_OFFSET;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_METRIC_RECORDS_SIZE;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_METRIC_VALUE_FORMAT;
-
@Service
public class MetricServiceImpl implements MetricService {
private static final Logger LOGGER = LoggerFactory.getLogger(MetricServiceImpl.class);
@@ -98,7 +98,7 @@ public class MetricServiceImpl implements MetricService {
}
@SuppressWarnings("rawtypes")
- @Override
+ @Override
public ResponseEntity addMetricValues(List<MetricValue> values) {
for (MetricValue value : values) {
checkFormat(value);
@@ -115,7 +115,7 @@ public class MetricServiceImpl implements MetricService {
}
@SuppressWarnings("rawtypes")
- @Override
+ @Override
public ResponseEntity deleteMetricValues(String metricName) {
try {
return metricStore.deleteMetricValues(metricName);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java b/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
index 53275c5..243a65d 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java
@@ -76,7 +76,7 @@ public class MetricStoreImpl implements MetricStore {
if (!user.isEmpty() && !password.isEmpty()) {
String encodedAuth = buildBasicAuthString(user, password);
Header[] requestHeaders = new Header[]{
- new BasicHeader(org.apache.http.HttpHeaders.AUTHORIZATION, encodedAuth)};
+ new BasicHeader(org.apache.http.HttpHeaders.AUTHORIZATION, encodedAuth)};
builder.setDefaultHeaders(requestHeaders);
}
this.client = builder.build();
@@ -106,13 +106,13 @@ public class MetricStoreImpl implements MetricStore {
}
private HttpEntity getHttpEntityForSearch(String metricName, int from, int size, long tmst)
- throws JsonProcessingException {
+ throws JsonProcessingException {
Map<String, Object> map = new HashMap<>();
Map<String, Object> queryParam = new HashMap<>();
Map<String, Object> termQuery = Collections.singletonMap("name.keyword", metricName);
queryParam.put("filter", Collections.singletonMap("term", termQuery));
Map<String, Object> sortParam = Collections
- .singletonMap("tmst", Collections.singletonMap("order", "desc"));
+ .singletonMap("tmst", Collections.singletonMap("order", "desc"));
map.put("query", Collections.singletonMap("bool", queryParam));
map.put("sort", sortParam);
map.put("from", from);
@@ -124,14 +124,14 @@ public class MetricStoreImpl implements MetricStore {
List<MetricValue> metricValues = new ArrayList<>();
JsonNode jsonNode = mapper.readTree(EntityUtils.toString(response.getEntity()));
if (jsonNode.hasNonNull("hits") && jsonNode.get("hits")
- .hasNonNull("hits")) {
+ .hasNonNull("hits")) {
for (JsonNode node : jsonNode.get("hits").get("hits")) {
JsonNode sourceNode = node.get("_source");
Map<String, Object> value = JsonUtil.toEntity(sourceNode.get("value").toString(),
- new TypeReference<Map<String, Object>>() {
- });
+ new TypeReference<Map<String, Object>>() {
+ });
MetricValue metricValue = new MetricValue(sourceNode.get("name").asText(),
- Long.parseLong(sourceNode.get("tmst").asText()), value);
+ Long.parseLong(sourceNode.get("tmst").asText()), value);
metricValues.add(metricValue);
}
}
@@ -159,7 +159,7 @@ public class MetricStoreImpl implements MetricStore {
@Override
public ResponseEntity<?> deleteMetricValues(String metricName) throws IOException {
Map<String, Object> param = Collections.singletonMap("query",
- Collections.singletonMap("term", Collections.singletonMap("name.keyword", metricName)));
+ Collections.singletonMap("term", Collections.singletonMap("name.keyword", metricName)));
HttpEntity entity = new NStringEntity(JsonUtil.toJson(param), ContentType.APPLICATION_JSON);
Response response = client.performRequest("POST", urlDelete, Collections.emptyMap(), entity);
return getResponseEntityFromResponse(response);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/util/FSUtil.java b/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
index 97fe93d..fb0fb2b 100644
--- a/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
+++ b/service/src/main/java/org/apache/griffin/core/util/FSUtil.java
@@ -19,6 +19,8 @@ under the License.
package org.apache.griffin.core.util;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.HDFS_FILE_NOT_EXIST;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -39,8 +41,6 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.HDFS_FILE_NOT_EXIST;
-
public class FSUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(FSUtil.class);
@@ -58,7 +58,7 @@ public class FSUtil {
private static void initFileSystem() {
Configuration conf = new Configuration();
-
+
if (StringUtils.isEmpty(conf.get("fs.hdfs.impl"))) {
LOGGER.info("Setting fs.hdfs.impl:{}", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
conf.set("fs.hdfs.impl", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
@@ -181,10 +181,10 @@ public class FSUtil {
}
}
- public static String getFirstMissRecordPath(String hdfsDir) throws Exception{
+ public static String getFirstMissRecordPath(String hdfsDir) throws Exception {
List<FileStatus> fileList = listFileStatus(hdfsDir);
- for(int i=0; i<fileList.size();i++){
- if(fileList.get(i).getPath().toUri().toString().toLowerCase().contains("missrecord")){
+ for (int i = 0; i < fileList.size(); i++) {
+ if (fileList.get(i).getPath().toUri().toString().toLowerCase().contains("missrecord")) {
return fileList.get(i).getPath().toUri().toString();
}
}
@@ -194,7 +194,7 @@ public class FSUtil {
public static InputStream getMissSampleInputStream(String path) throws Exception {
List<String> subDirList = listSubDir(path);
//FIXME: only handle 1-sub dir here now
- for(int i=0; i< subDirList.size();i++){
+ for (int i = 0; i < subDirList.size(); i++) {
return getSampleInputStream(getFirstMissRecordPath(subDirList.get(i)));
}
return getSampleInputStream(getFirstMissRecordPath(path));
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/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 615bbba..6933b70 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,9 @@ under the License.
package org.apache.griffin.core.util;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_CONNECTOR_NAME;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.MISSING_METRIC_NAME;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -33,9 +36,6 @@ import org.apache.griffin.core.measure.entity.Measure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.INVALID_CONNECTOR_NAME;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.MISSING_METRIC_NAME;
-
public class MeasureUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(MeasureUtil.class);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/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 4215da0..3d55a2a 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,8 @@ under the License.
package org.apache.griffin.core.util;
+import static org.apache.griffin.core.util.FileUtil.getFilePath;
+
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -31,8 +33,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
-import static org.apache.griffin.core.util.FileUtil.getFilePath;
-
public class PropertiesUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(PropertiesUtil.class);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java b/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
index cf54f91..a6ec9ad 100644
--- a/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
+++ b/service/src/test/java/org/apache/griffin/core/config/EclipseLinkJpaConfigForTest.java
@@ -19,6 +19,10 @@ under the License.
package org.apache.griffin.core.config;
+import java.util.HashMap;
+import java.util.Map;
+import javax.sql.DataSource;
+
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration;
@@ -30,10 +34,6 @@ import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;
import org.springframework.transaction.jta.JtaTransactionManager;
-import javax.sql.DataSource;
-import java.util.HashMap;
-import java.util.Map;
-
@TestConfiguration
@ComponentScan("org.apache.griffin.core")
public class EclipseLinkJpaConfigForTest extends JpaBaseConfiguration {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java b/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
index 5783b4b..cd48f3f 100644
--- a/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
+++ b/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java
@@ -19,6 +19,10 @@ under the License.
package org.apache.griffin.core.config;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,10 +31,6 @@ import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringRunner;
-import java.util.Properties;
-
-import static org.junit.Assert.assertEquals;
-
@RunWith(SpringRunner.class)
public class PropertiesConfigTest {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
index 5ef2735..d71814a 100644
--- a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
@@ -19,6 +19,11 @@ under the License.
package org.apache.griffin.core.info;
+import static org.hamcrest.CoreMatchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
import org.apache.griffin.core.util.URLHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,11 +32,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
-import static org.hamcrest.CoreMatchers.is;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
@RunWith(SpringRunner.class)
@WebMvcTest(value = GriffinInfoController.class, secure = false)
public class GriffinInfoControllerTest {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/test/java/org/apache/griffin/core/job/FileExistPredicatorTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/FileExistPredicatorTest.java b/service/src/test/java/org/apache/griffin/core/job/FileExistPredicatorTest.java
index c1436cb..0d144be 100644
--- a/service/src/test/java/org/apache/griffin/core/job/FileExistPredicatorTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/FileExistPredicatorTest.java
@@ -1,6 +1,7 @@
package org.apache.griffin.core.job;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -14,55 +15,55 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class FileExistPredicatorTest {
-
- static String fileName = "_SUCCESS";
- static String rootPath = "/tmp/";
-
- @BeforeClass
- public static void mkFile() throws IOException{
- File file = new File(rootPath + fileName);
- if(!file.exists()){
- file.createNewFile();
- }
- }
-
- @AfterClass
- public static void deleteFile(){
- File file = new File(rootPath + fileName);
- if(file.exists()){
- FileUtils.delete(file);
- }
- }
-
- @Test(expected = NullPointerException.class)
- public void test_predicate_null() throws IOException{
- SegmentPredicate predicate = new SegmentPredicate();
- predicate.setConfig("test config");
-
- Map<String, Object> configMap = new HashMap<>();
- predicate.setConfigMap(configMap);
-
- FileExistPredicator predicator = new FileExistPredicator(predicate);
- assertTrue(predicator.predicate());
- }
-
- @Test
- public void test_predicate() throws IOException{
- SegmentPredicate predicate = new SegmentPredicate();
- predicate.setConfig("test config");
-
- Map<String, Object> configMap = new HashMap<>();
- configMap.put("path", fileName);
- configMap.put("root.path", rootPath);
-
- predicate.setConfigMap(configMap);
-
- FileExistPredicator predicator = new FileExistPredicator(predicate);
- assertTrue(predicator.predicate());
-
- configMap.put("path", "fileName");
- predicate.setConfigMap(configMap);
- assertFalse(predicator.predicate());
-
- }
+
+ static String fileName = "_SUCCESS";
+ static String rootPath = "/tmp/";
+
+ @BeforeClass
+ public static void mkFile() throws IOException {
+ File file = new File(rootPath + fileName);
+ if (!file.exists()) {
+ file.createNewFile();
+ }
+ }
+
+ @AfterClass
+ public static void deleteFile() {
+ File file = new File(rootPath + fileName);
+ if (file.exists()) {
+ FileUtils.delete(file);
+ }
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void test_predicate_null() throws IOException {
+ SegmentPredicate predicate = new SegmentPredicate();
+ predicate.setConfig("test config");
+
+ Map<String, Object> configMap = new HashMap<>();
+ predicate.setConfigMap(configMap);
+
+ FileExistPredicator predicator = new FileExistPredicator(predicate);
+ assertTrue(predicator.predicate());
+ }
+
+ @Test
+ public void test_predicate() throws IOException {
+ SegmentPredicate predicate = new SegmentPredicate();
+ predicate.setConfig("test config");
+
+ Map<String, Object> configMap = new HashMap<>();
+ configMap.put("path", fileName);
+ configMap.put("root.path", rootPath);
+
+ predicate.setConfigMap(configMap);
+
+ FileExistPredicator predicator = new FileExistPredicator(predicate);
+ assertTrue(predicator.predicate());
+
+ configMap.put("path", "fileName");
+ predicate.setConfigMap(configMap);
+ assertFalse(predicator.predicate());
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
index 8e6b8b6..498b04b 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java
@@ -19,6 +19,21 @@ under the License.
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_ID_DOES_NOT_EXIST;
+import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_NAME_DOES_NOT_EXIST;
+import static org.apache.griffin.core.util.EntityHelper.createGriffinJob;
+import static org.hamcrest.CoreMatchers.is;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.Arrays;
+import java.util.Collections;
+
import org.apache.griffin.core.exception.GriffinException;
import org.apache.griffin.core.exception.GriffinExceptionHandler;
import org.apache.griffin.core.job.entity.AbstractJob;
@@ -36,21 +51,6 @@ import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import java.util.Arrays;
-import java.util.Collections;
-
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_ID_DOES_NOT_EXIST;
-import static org.apache.griffin.core.exception.GriffinExceptionMessage.JOB_NAME_DOES_NOT_EXIST;
-import static org.apache.griffin.core.util.EntityHelper.createGriffinJob;
-import static org.hamcrest.CoreMatchers.is;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doThrow;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
@RunWith(SpringRunner.class)
public class JobControllerTest {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
index 7e6080e..0887b0a 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
@@ -19,6 +19,16 @@ under the License.
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.BUSY;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.IDLE;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.NOT_STARTED;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.RECOVERING;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.RUNNING;
+import static org.apache.griffin.core.job.entity.LivySessionStates.State.STARTING;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
import org.apache.griffin.core.config.EclipseLinkJpaConfigForTest;
import org.apache.griffin.core.job.entity.JobInstanceBean;
import org.apache.griffin.core.job.entity.LivySessionStates;
@@ -37,16 +47,6 @@ import org.springframework.data.domain.Sort;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
-import java.util.List;
-
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.BUSY;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.IDLE;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.NOT_STARTED;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.RECOVERING;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.RUNNING;
-import static org.apache.griffin.core.job.entity.LivySessionStates.State.STARTING;
-import static org.junit.Assert.assertEquals;
-
@RunWith(SpringRunner.class)
@PropertySource("classpath:application.properties")
@ContextConfiguration(classes = {EclipseLinkJpaConfigForTest.class})
@@ -83,13 +83,13 @@ public class JobInstanceBeanRepoTest {
private void setEntityManager() {
VirtualJob job = new VirtualJob();
JobInstanceBean instance1 = new JobInstanceBean(1L, LivySessionStates.State.SUCCESS,
- "appId1", "http://domain.com/uri1", System.currentTimeMillis(), System.currentTimeMillis());
+ "appId1", "http://domain.com/uri1", System.currentTimeMillis(), System.currentTimeMillis());
instance1.setJob(job);
JobInstanceBean instance2 = new JobInstanceBean(2L, LivySessionStates.State.ERROR,
- "appId2", "http://domain.com/uri2", System.currentTimeMillis(), System.currentTimeMillis());
+ "appId2", "http://domain.com/uri2", System.currentTimeMillis(), System.currentTimeMillis());
instance2.setJob(job);
JobInstanceBean instance3 = new JobInstanceBean(2L, LivySessionStates.State.STARTING,
- "appId3", "http://domain.com/uri3", System.currentTimeMillis(), System.currentTimeMillis());
+ "appId3", "http://domain.com/uri3", System.currentTimeMillis(), System.currentTimeMillis());
instance3.setJob(job);
entityManager.persistAndFlush(job);
entityManager.persistAndFlush(instance1);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/966d831e/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java b/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
index e3b29f4..4209294 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java
@@ -19,6 +19,20 @@ under the License.
package org.apache.griffin.core.job;
+import static org.apache.griffin.core.util.EntityHelper.createFileExistPredicate;
+import static org.apache.griffin.core.util.EntityHelper.createGriffinMeasure;
+import static org.apache.griffin.core.util.EntityHelper.createJobDetail;
+import static org.apache.griffin.core.util.EntityHelper.createSimpleTrigger;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.griffin.core.job.entity.AbstractJob;
import org.apache.griffin.core.job.entity.BatchJob;
import org.apache.griffin.core.job.repo.BatchJobRepo;
@@ -31,7 +45,12 @@ import org.apache.griffin.core.util.PropertiesUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
-import org.quartz.*;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.Trigger;
+import org.quartz.TriggerKey;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.TestConfiguration;
@@ -41,15 +60,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.test.context.junit4.SpringRunner;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import static org.apache.griffin.core.util.EntityHelper.*;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.*;
-
@RunWith(SpringRunner.class)
public class JobInstanceTest {