optimize imports and add old feedback data handler policy

hugui · hugui · commit 57d437cbf284 · 2015-04-27T18:54:13.000+08:00
diff --git a/job-client/src/main/java/com/lts/job/client/JobClient.java b/job-client/src/main/java/com/lts/job/client/JobClient.java
@@ -1,15 +1,15 @@
 package com.lts.job.client;
 
 import com.lts.job.client.domain.JobClientApplication;
+import com.lts.job.client.domain.JobClientNode;
+import com.lts.job.client.domain.Response;
+import com.lts.job.client.domain.ResponseCode;
 import com.lts.job.client.processor.RemotingDispatcher;
 import com.lts.job.client.support.JobFinishedHandler;
 import com.lts.job.core.Application;
 import com.lts.job.core.cluster.AbstractClientNode;
 import com.lts.job.core.constant.Constants;
 import com.lts.job.core.domain.Job;
-import com.lts.job.client.domain.JobClientNode;
-import com.lts.job.client.domain.Response;
-import com.lts.job.client.domain.ResponseCode;
 import com.lts.job.core.exception.JobTrackerNotFoundException;
 import com.lts.job.core.protocol.JobProtos;
 import com.lts.job.core.protocol.command.JobSubmitRequest;
diff --git a/job-client/src/main/java/com/lts/job/client/RetryJobClient.java b/job-client/src/main/java/com/lts/job/client/RetryJobClient.java
@@ -2,9 +2,9 @@
 
 import com.lts.job.client.domain.JobClientApplication;
 import com.lts.job.client.domain.JobClientNode;
+import com.lts.job.client.domain.Response;
 import com.lts.job.client.domain.ResponseCode;
 import com.lts.job.core.domain.Job;
-import com.lts.job.client.domain.Response;
 import com.lts.job.core.support.RetryScheduler;
 
 import java.util.Arrays;
diff --git a/job-core/src/main/java/com/lts/job/core/Application.java b/job-core/src/main/java/com/lts/job/core/Application.java
@@ -2,9 +2,9 @@
 
 import com.lts.job.core.cluster.MasterElector;
 import com.lts.job.core.cluster.NodeManager;
-import com.lts.job.core.registry.PathParser;
 import com.lts.job.core.domain.JobNodeConfig;
 import com.lts.job.core.protocol.command.CommandBodyWrapper;
+import com.lts.job.core.registry.PathParser;
 
 /**
  * @author Robert HG (254963746@qq.com) on 8/17/14.
diff --git a/job-core/src/main/java/com/lts/job/core/cluster/AbstractJobNode.java b/job-core/src/main/java/com/lts/job/core/cluster/AbstractJobNode.java
@@ -1,14 +1,14 @@
 package com.lts.job.core.cluster;
 
+import com.lts.job.core.Application;
 import com.lts.job.core.domain.JobNodeConfig;
+import com.lts.job.core.factory.JobNodeConfigFactory;
 import com.lts.job.core.factory.NodeFactory;
 import com.lts.job.core.listener.MasterNodeChangeListener;
+import com.lts.job.core.listener.MasterNodeElectionListener;
 import com.lts.job.core.listener.NodeChangeListener;
 import com.lts.job.core.registry.Registry;
 import com.lts.job.core.registry.ZkNodeRegistry;
-import com.lts.job.core.Application;
-import com.lts.job.core.listener.MasterNodeElectionListener;
-import com.lts.job.core.factory.JobNodeConfigFactory;
 import com.lts.job.core.util.GenericsUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/job-core/src/main/java/com/lts/job/core/cluster/MasterElector.java b/job-core/src/main/java/com/lts/job/core/cluster/MasterElector.java
@@ -1,7 +1,7 @@
 package com.lts.job.core.cluster;
 
-import com.lts.job.core.listener.MasterNodeChangeListener;
 import com.lts.job.core.Application;
+import com.lts.job.core.listener.MasterNodeChangeListener;
 import com.lts.job.core.util.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/job-core/src/main/java/com/lts/job/core/listener/MasterNodeElectionListener.java b/job-core/src/main/java/com/lts/job/core/listener/MasterNodeElectionListener.java
@@ -1,7 +1,7 @@
 package com.lts.job.core.listener;
 
-import com.lts.job.core.cluster.Node;
 import com.lts.job.core.Application;
+import com.lts.job.core.cluster.Node;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/job-core/src/main/java/com/lts/job/core/registry/ZkNodeRegistry.java b/job-core/src/main/java/com/lts/job/core/registry/ZkNodeRegistry.java
@@ -1,9 +1,9 @@
 package com.lts.job.core.registry;
 
+import com.lts.job.core.Application;
 import com.lts.job.core.cluster.Node;
 import com.lts.job.core.cluster.NodeType;
 import com.lts.job.core.listener.NodeChangeListener;
-import com.lts.job.core.Application;
 import com.lts.job.core.util.CollectionUtils;
 import com.lts.job.registry.zookeeper.ChildListener;
 import com.lts.job.registry.zookeeper.StateListener;
diff --git a/job-core/src/main/java/com/lts/job/core/remoting/RemotingClientDelegate.java b/job-core/src/main/java/com/lts/job/core/remoting/RemotingClientDelegate.java
@@ -1,11 +1,11 @@
 package com.lts.job.core.remoting;
 
+import com.lts.job.core.Application;
 import com.lts.job.core.cluster.Node;
 import com.lts.job.core.exception.JobTrackerNotFoundException;
 import com.lts.job.core.loadbalance.LoadBalance;
-import com.lts.job.core.Application;
 import com.lts.job.remoting.InvokeCallback;
-import com.lts.job.remoting.exception.*;
+import com.lts.job.remoting.exception.RemotingCommandFieldCheckException;
 import com.lts.job.remoting.netty.NettyRemotingClient;
 import com.lts.job.remoting.netty.NettyRequestProcessor;
 import com.lts.job.remoting.protocol.RemotingCommand;
diff --git a/job-core/src/main/java/com/lts/job/core/remoting/RemotingServerDelegate.java b/job-core/src/main/java/com/lts/job/core/remoting/RemotingServerDelegate.java
@@ -1,7 +1,7 @@
 package com.lts.job.core.remoting;
 
-import com.lts.job.core.exception.RemotingSendException;
 import com.lts.job.core.Application;
+import com.lts.job.core.exception.RemotingSendException;
 import com.lts.job.remoting.InvokeCallback;
 import com.lts.job.remoting.RemotingServer;
 import com.lts.job.remoting.exception.RemotingCommandFieldCheckException;
diff --git a/job-core/src/main/java/com/lts/job/core/support/ConsistentHashSelector.java b/job-core/src/main/java/com/lts/job/core/support/ConsistentHashSelector.java
@@ -2,7 +2,9 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.*;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
 /**
  * 一致性hash算法
diff --git a/job-core/src/main/java/com/lts/job/core/support/CronExpression.java b/job-core/src/main/java/com/lts/job/core/support/CronExpression.java
@@ -3,16 +3,7 @@
 
 import java.io.Serializable;
 import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
-import java.util.TreeSet;
+import java.util.*;
 
 /**
  * Provides a parser and evaluator for unix-like cron expressions. Cron
diff --git a/job-core/src/main/java/com/lts/job/core/support/LevelDBStore.java b/job-core/src/main/java/com/lts/job/core/support/LevelDBStore.java
@@ -8,7 +8,8 @@
 import org.iq80.leveldb.DBIterator;
 import org.iq80.leveldb.Options;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/job-core/src/main/java/com/lts/job/core/support/RetryScheduler.java b/job-core/src/main/java/com/lts/job/core/support/RetryScheduler.java
@@ -4,7 +4,8 @@
 import com.lts.job.core.domain.KVPair;
 import com.lts.job.core.file.FileAccessor;
 import com.lts.job.core.file.FileException;
-import com.lts.job.core.util.*;
+import com.lts.job.core.util.GenericsUtils;
+import com.lts.job.core.util.JSONUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/job-core/src/main/java/com/lts/job/remoting/common/RemotingHelper.java b/job-core/src/main/java/com/lts/job/remoting/common/RemotingHelper.java
@@ -1,6 +1,7 @@
 package com.lts.job.remoting.common;
 
 import io.netty.channel.Channel;
+
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
diff --git a/job-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java b/job-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java
@@ -6,6 +6,7 @@
 import com.lts.job.queue.mongo.MongoJobQueue;
 import com.lts.job.queue.mongo.store.Config;
 import com.lts.job.tracker.JobTracker;
+import com.lts.job.tracker.support.policy.OldDataDeletePolicy;
 
 /**
  * @author Robert HG (254963746@qq.com) on 8/13/14.
@@ -31,7 +32,7 @@ public static void main(String[] args) {
         jobTracker.setJobQueue(new MongoJobQueue(config));
         jobTracker.setJobFeedbackQueue(new MongoJobFeedbackQueue(config));
         jobTracker.setJobLogger(new MongoJobLogger(config));
-
+        jobTracker.setOldDataHandler(new OldDataDeletePolicy());
         // 启动节点
         jobTracker.start();
 
diff --git a/job-example/src/main/java/com/lts/job/example/support/JobFinishedHandlerImpl.java b/job-example/src/main/java/com/lts/job/example/support/JobFinishedHandlerImpl.java
@@ -3,7 +3,6 @@
 import com.lts.job.client.support.JobFinishedHandler;
 import com.lts.job.core.domain.JobResult;
 import com.lts.job.core.util.CollectionUtils;
-import com.lts.job.core.util.JSONUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/job-extensions/job-mongo-queue/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java b/job-extensions/job-mongo-queue/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java
@@ -1,10 +1,10 @@
 package com.lts.job.queue.mongo;
 
 import com.google.code.morphia.query.Query;
+import com.lts.job.queue.mongo.store.AbstractMongoRepository;
 import com.lts.job.queue.mongo.store.Config;
 import com.lts.job.tracker.queue.JobFeedbackPo;
 import com.lts.job.tracker.queue.JobFeedbackQueue;
-import com.lts.job.queue.mongo.store.AbstractMongoRepository;
 
 import java.util.List;
 
diff --git a/job-extensions/job-mongo-queue/src/main/java/com/lts/job/queue/mongo/MongoJobLogger.java b/job-extensions/job-mongo-queue/src/main/java/com/lts/job/queue/mongo/MongoJobLogger.java
@@ -1,10 +1,10 @@
 package com.lts.job.queue.mongo;
 
-import com.lts.job.queue.mongo.store.Config;
 import com.lts.job.queue.mongo.store.AbstractMongoRepository;
+import com.lts.job.queue.mongo.store.Config;
+import com.lts.job.tracker.logger.JobLogger;
 import com.lts.job.tracker.logger.domain.BizLogPo;
 import com.lts.job.tracker.logger.domain.JobLogPo;
-import com.lts.job.tracker.logger.JobLogger;
 
 /**
  * @author Robert HG (254963746@qq.com) on 3/27/15.
@@ -28,6 +28,6 @@ public void log(BizLogPo bizLogPo) {
         jobLogPo.setTaskTrackerIdentity(bizLogPo.getTaskTrackerIdentity());
         jobLogPo.setJobId(bizLogPo.getJobId());
         jobLogPo.setMsg(bizLogPo.getMsg());
-
+        super.save(jobLogPo);
     }
 }
diff --git a/job-extensions/job-mongo-queue/src/main/java/com/lts/job/queue/mongo/MongoJobQueue.java b/job-extensions/job-mongo-queue/src/main/java/com/lts/job/queue/mongo/MongoJobQueue.java
@@ -2,11 +2,11 @@
 
 import com.google.code.morphia.query.Query;
 import com.google.code.morphia.query.UpdateOperations;
+import com.lts.job.queue.mongo.store.AbstractMongoRepository;
 import com.lts.job.queue.mongo.store.Config;
-import com.lts.job.tracker.queue.JobPo;
 import com.lts.job.tracker.queue.DuplicateJobException;
+import com.lts.job.tracker.queue.JobPo;
 import com.lts.job.tracker.queue.JobQueue;
-import com.lts.job.queue.mongo.store.AbstractMongoRepository;
 import com.mongodb.MongoException;
 
 import java.util.List;
diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/TaskTracker.java b/job-task-tracker/src/main/java/com/lts/job/task/tracker/TaskTracker.java
@@ -1,11 +1,11 @@
 package com.lts.job.task.tracker;
 
-import com.lts.job.core.cluster.*;
+import com.lts.job.core.cluster.AbstractClientNode;
 import com.lts.job.core.constant.Constants;
+import com.lts.job.core.constant.Level;
 import com.lts.job.remoting.netty.NettyRequestProcessor;
 import com.lts.job.task.tracker.domain.TaskTrackerApplication;
 import com.lts.job.task.tracker.domain.TaskTrackerNode;
-import com.lts.job.core.constant.Level;
 import com.lts.job.task.tracker.processor.RemotingDispatcher;
 import com.lts.job.task.tracker.runner.JobRunner;
 import com.lts.job.task.tracker.runner.RunnerPool;
diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerApplication.java b/job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerApplication.java
@@ -2,8 +2,8 @@
 
 import com.lts.job.core.Application;
 import com.lts.job.core.constant.Constants;
-import com.lts.job.core.remoting.RemotingClientDelegate;
 import com.lts.job.core.constant.Level;
+import com.lts.job.core.remoting.RemotingClientDelegate;
 import com.lts.job.task.tracker.runner.RunnerFactory;
 import com.lts.job.task.tracker.runner.RunnerPool;
 
diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobPushProcessor.java b/job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobPushProcessor.java
@@ -15,8 +15,8 @@
 import com.lts.job.remoting.netty.ResponseFuture;
 import com.lts.job.remoting.protocol.RemotingCommand;
 import com.lts.job.remoting.protocol.RemotingProtos;
-import com.lts.job.task.tracker.domain.TaskTrackerApplication;
 import com.lts.job.task.tracker.domain.Response;
+import com.lts.job.task.tracker.domain.TaskTrackerApplication;
 import com.lts.job.task.tracker.expcetion.NoAvailableJobRunnerException;
 import com.lts.job.task.tracker.runner.RunnerCallback;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunnerDelegate.java b/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunnerDelegate.java
@@ -2,8 +2,8 @@
 
 import com.lts.job.core.domain.Job;
 import com.lts.job.core.exception.JobInfoException;
-import com.lts.job.task.tracker.domain.TaskTrackerApplication;
 import com.lts.job.task.tracker.domain.Response;
+import com.lts.job.task.tracker.domain.TaskTrackerApplication;
 import com.lts.job.task.tracker.logger.BizLoggerFactory;
 import com.lts.job.task.tracker.logger.BizLoggerImpl;
 import org.slf4j.Logger;
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/JobTracker.java b/job-tracker/src/main/java/com/lts/job/tracker/JobTracker.java
@@ -1,21 +1,22 @@
 package com.lts.job.tracker;
 
-import com.lts.job.core.cluster.*;
+import com.lts.job.core.cluster.AbstractServerNode;
 import com.lts.job.core.constant.Constants;
 import com.lts.job.core.util.Assert;
+import com.lts.job.remoting.netty.NettyRequestProcessor;
+import com.lts.job.tracker.channel.ChannelManager;
 import com.lts.job.tracker.domain.JobTrackerApplication;
+import com.lts.job.tracker.domain.JobTrackerNode;
 import com.lts.job.tracker.logger.DefaultLogger;
 import com.lts.job.tracker.logger.JobLogger;
+import com.lts.job.tracker.processor.RemotingDispatcher;
 import com.lts.job.tracker.queue.JobFeedbackQueue;
 import com.lts.job.tracker.queue.JobQueue;
-import com.lts.job.remoting.netty.NettyRequestProcessor;
-import com.lts.job.tracker.channel.ChannelManager;
-import com.lts.job.tracker.domain.JobTrackerNode;
-import com.lts.job.tracker.processor.RemotingDispatcher;
 import com.lts.job.tracker.support.JobClientManager;
+import com.lts.job.tracker.support.OldDataHandler;
+import com.lts.job.tracker.support.TaskTrackerManager;
 import com.lts.job.tracker.support.listener.JobNodeChangeListener;
 import com.lts.job.tracker.support.listener.JobTrackerMasterChangeListener;
-import com.lts.job.tracker.support.TaskTrackerManager;
 
 /**
  * @author Robert HG (254963746@qq.com) on 7/23/14.
@@ -78,4 +79,8 @@ public void setJobQueue(JobQueue jobQueue) {
     public void setJobFeedbackQueue(JobFeedbackQueue jobFeedbackQueue) {
         application.setJobFeedbackQueue(jobFeedbackQueue);
     }
+
+    public void setOldDataHandler(OldDataHandler oldDataHandler) {
+        application.setOldDataHandler(oldDataHandler);
+    }
 }
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java b/job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java
@@ -7,6 +7,7 @@
 import com.lts.job.tracker.queue.JobFeedbackQueue;
 import com.lts.job.tracker.queue.JobQueue;
 import com.lts.job.tracker.support.JobClientManager;
+import com.lts.job.tracker.support.OldDataHandler;
 import com.lts.job.tracker.support.TaskTrackerManager;
 import com.lts.job.tracker.support.checker.DeadJobChecker;
 
@@ -31,6 +32,8 @@ public class JobTrackerApplication extends Application {
     private JobFeedbackQueue jobFeedbackQueue;
     // 死任务检查器
     private DeadJobChecker deadJobChecker;
+    // 对老数据的处理(脏数据)
+    private OldDataHandler oldDataHandler;
 
     public JobFeedbackQueue getJobFeedbackQueue() {
         return jobFeedbackQueue;
@@ -95,4 +98,12 @@ public DeadJobChecker getDeadJobChecker() {
     public void setDeadJobChecker(DeadJobChecker deadJobChecker) {
         this.deadJobChecker = deadJobChecker;
     }
+
+    public OldDataHandler getOldDataHandler() {
+        return oldDataHandler;
+    }
+
+    public void setOldDataHandler(OldDataHandler oldDataHandler) {
+        this.oldDataHandler = oldDataHandler;
+    }
 }
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/JobFinishedProcessor.java b/job-tracker/src/main/java/com/lts/job/tracker/processor/JobFinishedProcessor.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/RemotingDispatcher.java b/job-tracker/src/main/java/com/lts/job/tracker/processor/RemotingDispatcher.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifier.java b/job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifier.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/JobClientManager.java b/job-tracker/src/main/java/com/lts/job/tracker/support/JobClientManager.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/JobDistributor.java b/job-tracker/src/main/java/com/lts/job/tracker/support/JobDistributor.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/JobDomainConverter.java b/job-tracker/src/main/java/com/lts/job/tracker/support/JobDomainConverter.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/JobReceiver.java b/job-tracker/src/main/java/com/lts/job/tracker/support/JobReceiver.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/OldDataHandler.java b/job-tracker/src/main/java/com/lts/job/tracker/support/OldDataHandler.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/checker/DeadJobChecker.java b/job-tracker/src/main/java/com/lts/job/tracker/support/checker/DeadJobChecker.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/checker/FeedbackJobSendChecker.java b/job-tracker/src/main/java/com/lts/job/tracker/support/checker/FeedbackJobSendChecker.java
diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/policy/OldDataDeletePolicy.java b/job-tracker/src/main/java/com/lts/job/tracker/support/policy/OldDataDeletePolicy.java
