Merge pull request #278 from ltsopensource/develop

qq254963746 · qq254963746 · commit ffcce0c8ab8d · 2016-04-22T21:57:29.000+08:00
ConfigurationProperties 支持
diff --git a/lts-core/src/main/java/com/github/ltsopensource/autoconfigure/resolver/EnumResolver.java b/lts-core/src/main/java/com/github/ltsopensource/autoconfigure/resolver/EnumResolver.java
@@ -11,6 +11,7 @@ public class EnumResolver extends AbstractResolver {
 
     public static final EnumResolver INSTANCE = new EnumResolver();
 
+    @SuppressWarnings("unchecked")
     @Override
     public void resolve(final AutoConfigContext context, final PropertyDescriptor descriptor, final Class<?> propertyType) {
 
diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/properties/JobClientProperties.java b/lts-core/src/main/java/com/github/ltsopensource/core/properties/JobClientProperties.java
@@ -1,4 +1,4 @@
-package com.github.ltsopensource.jobclient;
+package com.github.ltsopensource.core.properties;
 
 
 import com.github.ltsopensource.autoconfigure.annotation.ConfigurationProperties;
diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/properties/JobTrackerProperties.java b/lts-core/src/main/java/com/github/ltsopensource/core/properties/JobTrackerProperties.java
@@ -1,4 +1,4 @@
-package com.github.ltsopensource.jobtracker;
+package com.github.ltsopensource.core.properties;
 
 
 import com.github.ltsopensource.autoconfigure.annotation.ConfigurationProperties;
diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/properties/TaskTrackerProperties.java b/lts-core/src/main/java/com/github/ltsopensource/core/properties/TaskTrackerProperties.java
@@ -1,12 +1,11 @@
-package com.github.ltsopensource.tasktracker;
+package com.github.ltsopensource.core.properties;
 
 
 import com.github.ltsopensource.autoconfigure.annotation.ConfigurationProperties;
 import com.github.ltsopensource.core.cluster.AbstractConfigProperties;
 import com.github.ltsopensource.core.commons.utils.Assert;
 import com.github.ltsopensource.core.constant.Level;
 import com.github.ltsopensource.core.exception.ConfigPropertiesIllegalException;
-import com.github.ltsopensource.tasktracker.runner.JobRunner;
 
 /**
  * @author Robert HG (254963746@qq.com) on 4/9/16.
@@ -31,7 +30,7 @@ public class TaskTrackerProperties extends AbstractConfigProperties {
 
     private DispatchRunner dispatchRunner;
 
-    private Class<? extends JobRunner> jobRunnerClass;
+    private Class<?> jobRunnerClass;
 
     public String getNodeGroup() {
         return nodeGroup;
@@ -57,11 +56,11 @@ public void setWorkThreads(int workThreads) {
         this.workThreads = workThreads;
     }
 
-    public Class<? extends JobRunner> getJobRunnerClass() {
+    public Class<?> getJobRunnerClass() {
         return jobRunnerClass;
     }
 
-    public void setJobRunnerClass(Class<? extends JobRunner> jobRunnerClass) {
+    public void setJobRunnerClass(Class<?> jobRunnerClass) {
         this.jobRunnerClass = jobRunnerClass;
     }
 
@@ -114,6 +113,5 @@ public String getShardValue() {
         public void setShardValue(String shardValue) {
             this.shardValue = shardValue;
         }
-
     }
 }
diff --git a/lts-example/src/main/resources/application.properties b/lts-example/src/main/resources/application.properties
@@ -19,7 +19,7 @@ lts.tasktracker.registry-address=zookeeper://127.0.0.1:2181
 lts.tasktracker.node-group=test_trade_TaskTracker
 lts.tasktracker.dispatch-runner.enable=true
 lts.tasktracker.dispatch-runner.shard-value=taskId
-lts.tasktracker.job-runner-class=com.github.ltsopensource.example.support.TestJobRunner
+#lts.tasktracker.job-runner-class=com.github.ltsopensource.example.support.TestJobRunner
 
 lts.monitor.cluster-name=test_cluster
 lts.monitor.registry-address=zookeeper://127.0.0.1:2181
diff --git a/lts-jobclient/src/main/java/com/github/ltsopensource/jobclient/JobClientBuilder.java b/lts-jobclient/src/main/java/com/github/ltsopensource/jobclient/JobClientBuilder.java
@@ -4,6 +4,7 @@
 import com.github.ltsopensource.core.cluster.AbstractNodeBuilder;
 import com.github.ltsopensource.core.commons.utils.CollectionUtils;
 import com.github.ltsopensource.core.commons.utils.StringUtils;
+import com.github.ltsopensource.core.properties.JobClientProperties;
 import com.github.ltsopensource.jobclient.support.JobCompletedHandler;
 
 import java.util.Map;
@@ -21,7 +22,7 @@ public JobClientBuilder setJobCompletedHandler(JobCompletedHandler jobCompletedH
     }
 
     @Override
-    public JobClient build0() {
+    protected JobClient build0() {
         JobClientProperties properties = PropertiesConfigurationFactory
                 .createPropertiesConfiguration(JobClientProperties.class, locations);
 
diff --git a/lts-jobtracker/src/main/java/com/github/ltsopensource/jobtracker/JobTrackerBuilder.java b/lts-jobtracker/src/main/java/com/github/ltsopensource/jobtracker/JobTrackerBuilder.java
@@ -4,6 +4,7 @@
 import com.github.ltsopensource.core.cluster.AbstractNodeBuilder;
 import com.github.ltsopensource.core.commons.utils.CollectionUtils;
 import com.github.ltsopensource.core.commons.utils.StringUtils;
+import com.github.ltsopensource.core.properties.JobTrackerProperties;
 
 import java.util.Map;
 
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/JobClientFactoryBean.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/JobClientFactoryBean.java
@@ -5,7 +5,7 @@
 import com.github.ltsopensource.core.listener.MasterChangeListener;
 import com.github.ltsopensource.jobclient.JobClient;
 import com.github.ltsopensource.jobclient.JobClientBuilder;
-import com.github.ltsopensource.jobclient.JobClientProperties;
+import com.github.ltsopensource.core.properties.JobClientProperties;
 import com.github.ltsopensource.jobclient.support.JobCompletedHandler;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/JobTrackerFactoryBean.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/JobTrackerFactoryBean.java
@@ -5,13 +5,12 @@
 import com.github.ltsopensource.core.listener.MasterChangeListener;
 import com.github.ltsopensource.jobtracker.JobTracker;
 import com.github.ltsopensource.jobtracker.JobTrackerBuilder;
-import com.github.ltsopensource.jobtracker.JobTrackerProperties;
+import com.github.ltsopensource.core.properties.JobTrackerProperties;
 import com.github.ltsopensource.jobtracker.support.OldDataHandler;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
-import java.util.Map;
 import java.util.Properties;
 
 /**
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/TaskTrackerAnnotationFactoryBean.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/TaskTrackerAnnotationFactoryBean.java
@@ -8,7 +8,7 @@
 import com.github.ltsopensource.spring.tasktracker.JobDispatcher;
 import com.github.ltsopensource.tasktracker.TaskTracker;
 import com.github.ltsopensource.tasktracker.TaskTrackerBuilder;
-import com.github.ltsopensource.tasktracker.TaskTrackerProperties;
+import com.github.ltsopensource.core.properties.TaskTrackerProperties;
 import com.github.ltsopensource.tasktracker.runner.JobRunner;
 import com.github.ltsopensource.tasktracker.runner.RunnerFactory;
 import org.springframework.beans.BeansException;
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/TaskTrackerXmlFactoryBean.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/TaskTrackerXmlFactoryBean.java
@@ -7,7 +7,7 @@
 import com.github.ltsopensource.core.listener.MasterChangeListener;
 import com.github.ltsopensource.tasktracker.TaskTracker;
 import com.github.ltsopensource.tasktracker.TaskTrackerBuilder;
-import com.github.ltsopensource.tasktracker.TaskTrackerProperties;
+import com.github.ltsopensource.core.properties.TaskTrackerProperties;
 import com.github.ltsopensource.tasktracker.runner.JobRunner;
 import com.github.ltsopensource.tasktracker.runner.RunnerFactory;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/boot/properties/JobClientProperties.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/boot/properties/JobClientProperties.java
@@ -6,6 +6,6 @@
  * @author Robert HG (254963746@qq.com) on 4/9/16.
  */
 @ConfigurationProperties(prefix = "lts.jobclient")
-public class JobClientProperties extends com.github.ltsopensource.jobclient.JobClientProperties {
+public class JobClientProperties extends com.github.ltsopensource.core.properties.JobClientProperties {
 
 }
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/boot/properties/JobTrackerProperties.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/boot/properties/JobTrackerProperties.java
@@ -6,7 +6,7 @@
  * @author Robert HG (254963746@qq.com) on 4/9/16.
  */
 @ConfigurationProperties(prefix = "lts.jobtracker")
-public class JobTrackerProperties extends com.github.ltsopensource.jobtracker.JobTrackerProperties {
+public class JobTrackerProperties extends com.github.ltsopensource.core.properties.JobTrackerProperties {
 
     /**
      * 监听端口
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/boot/properties/TaskTrackerProperties.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/boot/properties/TaskTrackerProperties.java
@@ -6,6 +6,6 @@
  * @author Robert HG (254963746@qq.com) on 4/9/16.
  */
 @ConfigurationProperties(prefix = "lts.tasktracker")
-public class TaskTrackerProperties extends com.github.ltsopensource.tasktracker.TaskTrackerProperties {
+public class TaskTrackerProperties extends com.github.ltsopensource.core.properties.TaskTrackerProperties {
 
 }
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/quartz/QuartzLTSConfig.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/quartz/QuartzLTSConfig.java
@@ -3,8 +3,8 @@
 import com.github.ltsopensource.autoconfigure.annotation.ConfigurationProperties;
 import com.github.ltsopensource.core.commons.utils.Assert;
 import com.github.ltsopensource.core.exception.ConfigPropertiesIllegalException;
-import com.github.ltsopensource.jobclient.JobClientProperties;
-import com.github.ltsopensource.tasktracker.TaskTrackerProperties;
+import com.github.ltsopensource.core.properties.JobClientProperties;
+import com.github.ltsopensource.core.properties.TaskTrackerProperties;
 
 /**
  * @author Robert HG (254963746@qq.com) on 3/16/16.
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/quartz/QuartzLTSProxyAgent.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/quartz/QuartzLTSProxyAgent.java
@@ -9,7 +9,7 @@
 import com.github.ltsopensource.core.logger.LoggerFactory;
 import com.github.ltsopensource.jobclient.JobClient;
 import com.github.ltsopensource.jobclient.JobClientBuilder;
-import com.github.ltsopensource.jobclient.JobClientProperties;
+import com.github.ltsopensource.core.properties.JobClientProperties;
 import com.github.ltsopensource.jobclient.domain.Response;
 import com.github.ltsopensource.tasktracker.TaskTracker;
 import com.github.ltsopensource.tasktracker.TaskTrackerBuilder;
diff --git a/lts-spring/src/main/java/com/github/ltsopensource/spring/quartz/QuartzLTSProxyBean.java b/lts-spring/src/main/java/com/github/ltsopensource/spring/quartz/QuartzLTSProxyBean.java
@@ -3,8 +3,8 @@
 import com.github.ltsopensource.autoconfigure.PropertiesConfigurationFactory;
 import com.github.ltsopensource.core.logger.Logger;
 import com.github.ltsopensource.core.logger.LoggerFactory;
-import com.github.ltsopensource.jobclient.JobClientProperties;
-import com.github.ltsopensource.tasktracker.TaskTrackerProperties;
+import com.github.ltsopensource.core.properties.JobClientProperties;
+import com.github.ltsopensource.core.properties.TaskTrackerProperties;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/lts-tasktracker/src/main/java/com/github/ltsopensource/tasktracker/TaskTrackerBuilder.java b/lts-tasktracker/src/main/java/com/github/ltsopensource/tasktracker/TaskTrackerBuilder.java
@@ -4,6 +4,8 @@
 import com.github.ltsopensource.core.cluster.AbstractNodeBuilder;
 import com.github.ltsopensource.core.commons.utils.CollectionUtils;
 import com.github.ltsopensource.core.commons.utils.StringUtils;
+import com.github.ltsopensource.core.properties.TaskTrackerProperties;
+import com.github.ltsopensource.tasktracker.runner.JobRunner;
 
 import java.util.Map;
 
@@ -19,6 +21,7 @@ protected TaskTracker build0() {
         return buildByProperties(properties);
     }
 
+    @SuppressWarnings("unchecked")
     public static TaskTracker buildByProperties(TaskTrackerProperties properties) {
         TaskTracker taskTracker = new TaskTracker();
         taskTracker.setRegistryAddress(properties.getRegistryAddress());
@@ -49,7 +52,7 @@ public static TaskTracker buildByProperties(TaskTrackerProperties properties) {
             taskTracker.setWorkThreads(properties.getWorkThreads());
         }
         if (properties.getJobRunnerClass() != null) {
-            taskTracker.setJobRunnerClass(properties.getJobRunnerClass());
+            taskTracker.setJobRunnerClass((Class<? extends JobRunner>) properties.getJobRunnerClass());
         }
 
         return taskTracker;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.ltsopensource.jobclient;`
	`1`	`+package com.github.ltsopensource.core.properties;`
`2`	`2`
`3`	`3`
`4`	`4`	`import com.github.ltsopensource.autoconfigure.annotation.ConfigurationProperties;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.ltsopensource.jobtracker;`
	`1`	`+package com.github.ltsopensource.core.properties;`
`2`	`2`
`3`	`3`
`4`	`4`	`import com.github.ltsopensource.autoconfigure.annotation.ConfigurationProperties;`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`		`-package com.github.ltsopensource.tasktracker;`
	`1`	`+package com.github.ltsopensource.core.properties;`
`2`	`2`
`3`	`3`
`4`	`4`	`import com.github.ltsopensource.autoconfigure.annotation.ConfigurationProperties;`
`5`	`5`	`import com.github.ltsopensource.core.cluster.AbstractConfigProperties;`
`6`	`6`	`import com.github.ltsopensource.core.commons.utils.Assert;`
`7`	`7`	`import com.github.ltsopensource.core.constant.Level;`
`8`	`8`	`import com.github.ltsopensource.core.exception.ConfigPropertiesIllegalException;`
`9`		`-import com.github.ltsopensource.tasktracker.runner.JobRunner;`
`10`	`9`
`11`	`10`	`/**`
`12`	`11`	`* @author Robert HG ([email protected]) on 4/9/16.`
`@@ -31,7 +30,7 @@ public class TaskTrackerProperties extends AbstractConfigProperties {`
`31`	`30`
`32`	`31`	`private DispatchRunner dispatchRunner;`
`33`	`32`
`34`		`- private Class<? extends JobRunner> jobRunnerClass;`
	`33`	`+ private Class<?> jobRunnerClass;`
`35`	`34`
`36`	`35`	`public String getNodeGroup() {`
`37`	`36`	`return nodeGroup;`
`@@ -57,11 +56,11 @@ public void setWorkThreads(int workThreads) {`
`57`	`56`	`this.workThreads = workThreads;`
`58`	`57`	`}`
`59`	`58`
`60`		`- public Class<? extends JobRunner> getJobRunnerClass() {`
	`59`	`+ public Class<?> getJobRunnerClass() {`
`61`	`60`	`return jobRunnerClass;`
`62`	`61`	`}`
`63`	`62`
`64`		`- public void setJobRunnerClass(Class<? extends JobRunner> jobRunnerClass) {`
	`63`	`+ public void setJobRunnerClass(Class<?> jobRunnerClass) {`
`65`	`64`	`this.jobRunnerClass = jobRunnerClass;`
`66`	`65`	`}`
`67`	`66`
`@@ -114,6 +113,5 @@ public String getShardValue() {`
`114`	`113`	`public void setShardValue(String shardValue) {`
`115`	`114`	`this.shardValue = shardValue;`
`116`	`115`	`}`
`117`		`-`
`118`	`116`	`}`
`119`	`117`	`}`