Merge pull request #276 from ltsopensource/develop

ConfigurationProperties 支持

Author: qq254963746

lts-core/src/main/java/com/github/ltsopensource/autoconfigure/PropertiesConfigurationFactory.java

@@ -76,6 +76,16 @@ public static <T> T createPropertiesConfiguration(Class<T> clazz) {
         }
         ConfigurationProperties annotation = clazz.getAnnotation(ConfigurationProperties.class);
         String[] locations = annotation.locations();
+        return createPropertiesConfiguration(clazz, locations);
+    }
+
+    public static <T> T createPropertiesConfiguration(Class<T> clazz, String[] locations) {
+        if (clazz == null) {
+            throw new IllegalArgumentException("clazz should not be null");
+        }
+        if (!clazz.isAnnotationPresent(ConfigurationProperties.class)) {
+            throw new IllegalArgumentException(clazz.getName() + " must annotation with @" + ConfigurationProperties.class.getName());
+        }
         if (locations == null || locations.length == 0) {
             throw new IllegalArgumentException(clazz.getName() + " must specified the properties locations");
         }

lts-core/src/main/java/com/github/ltsopensource/autoconfigure/resolver/ArrayResolver.java

@@ -1,6 +1,7 @@
 package com.github.ltsopensource.autoconfigure.resolver;
 
 import com.github.ltsopensource.autoconfigure.AutoConfigContext;
+import com.github.ltsopensource.autoconfigure.PropertiesConfigurationResolveException;
 import com.github.ltsopensource.core.commons.utils.PrimitiveTypeUtils;
 import com.github.ltsopensource.core.json.JSON;
 
@@ -43,7 +44,13 @@ public boolean call(String name, String key, String value) {
             for (Map.Entry<String, String> entry : kvMap.entrySet()) {
                 String value = entry.getValue();
 
-                if (PrimitiveTypeUtils.isPrimitiveClass(componentClass)) {
+                if (componentClass == Class.class) {
+                    try {
+                        Array.set(array, index++, Class.forName(value));
+                    } catch (ClassNotFoundException e) {
+                        throw new PropertiesConfigurationResolveException(e);
+                    }
+                } else if (PrimitiveTypeUtils.isPrimitiveClass(componentClass)) {
                     Array.set(array, index++, PrimitiveTypeUtils.convert(value, componentClass));
                 } else {
                     Array.set(array, index++, JSON.parse(value, componentClass));

lts-core/src/main/java/com/github/ltsopensource/autoconfigure/resolver/ClassResolver.java

@@ -0,0 +1,37 @@
+package com.github.ltsopensource.autoconfigure.resolver;
+
+import com.github.ltsopensource.autoconfigure.AutoConfigContext;
+import com.github.ltsopensource.autoconfigure.PropertiesConfigurationResolveException;
+
+import java.beans.PropertyDescriptor;
+
+/**
+ * @author Robert HG ([email protected]) on 4/21/16.
+ */
+public class ClassResolver extends AbstractResolver {
+
+    public static final ClassResolver INSTANCE = new ClassResolver();
+
+    @Override
+    public void resolve(final AutoConfigContext context, final PropertyDescriptor descriptor, Class<?> propertyType) {
+
+        doFilter(context, descriptor, new Filter() {
+            @Override
+            public boolean onCondition(String name, String key, String value) {
+                return key.equals(name);
+            }
+
+            @Override
+            public boolean call(String name, String key, String value) {
+                try {
+                    Class clazz = Class.forName(value);
+                    writeProperty(context, descriptor, clazz);
+                } catch (ClassNotFoundException e) {
+                    throw new PropertiesConfigurationResolveException(e);
+                }
+                return false;
+            }
+        });
+
+    }
+}

lts-core/src/main/java/com/github/ltsopensource/autoconfigure/resolver/CollectionResolver.java

@@ -32,7 +32,13 @@ public boolean onCondition(String name, String key, String value) {
 
             @Override
             public boolean call(String name, String key, String value) {
-                if (PrimitiveTypeUtils.isPrimitiveClass(itemType)) {
+                if (itemType == Class.class) {
+                    try {
+                        collection.add(Class.forName(value));
+                    } catch (ClassNotFoundException e) {
+                        throw new PropertiesConfigurationResolveException(e);
+                    }
+                } else if (PrimitiveTypeUtils.isPrimitiveClass(itemType)) {
                     collection.add(PrimitiveTypeUtils.convert(value, itemType));
                 } else {
                     collection.add(JSON.parse(value, itemType));

lts-core/src/main/java/com/github/ltsopensource/autoconfigure/resolver/MapResolver.java

@@ -45,7 +45,14 @@ public boolean call(String name, String key, String value) {
                 if (mapKey.startsWith("[") && mapKey.endsWith("]")) {
                     mapKey = mapKey.substring(1, mapKey.length() - 1);
                 }
-                if (PrimitiveTypeUtils.isPrimitiveClass(vClass)) {
+                if (vClass == Class.class) {
+                    try {
+                        Class clazz = Class.forName(value);
+                        map.put(mapKey, clazz);
+                    } catch (ClassNotFoundException e) {
+                        throw new PropertiesConfigurationResolveException(e);
+                    }
+                } else if (PrimitiveTypeUtils.isPrimitiveClass(vClass)) {
                     map.put(mapKey, PrimitiveTypeUtils.convert(value, vClass));
                 } else {
                     map.put(mapKey, JSON.parse(value, vClass));

lts-core/src/main/java/com/github/ltsopensource/autoconfigure/resolver/ResolverUtils.java

@@ -11,7 +11,11 @@ public class ResolverUtils {
 
     public static Resolver getResolver(Class<?> clazz) {
 
-        if (PrimitiveTypeUtils.isPrimitiveClass(clazz)) {
+        if (clazz == Class.class) {
+
+            return ClassResolver.INSTANCE;
+
+        } else if (PrimitiveTypeUtils.isPrimitiveClass(clazz)) {
 
             return PrimitiveTypeResolver.INSTANCE;
 

lts-spring/src/main/java/com/github/ltsopensource/spring/boot/properties/AbstractProperties.java renamed to lts-core/src/main/java/com/github/ltsopensource/core/cluster/AbstractConfigProperties.java

@@ -1,12 +1,14 @@
-package com.github.ltsopensource.spring.boot.properties;
+package com.github.ltsopensource.core.cluster;
+
+import com.github.ltsopensource.core.exception.ConfigPropertiesIllegalException;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author Robert HG ([email protected]) on 4/9/16.
+ * @author Robert HG ([email protected]) on 4/21/16.
  */
-public class AbstractProperties {
+public abstract class AbstractConfigProperties {
 
     /**
      * 节点标识(可选)
@@ -29,6 +31,8 @@ public class AbstractProperties {
      */
     private Map<String, String> configs = new HashMap<String, String>();
 
+    public abstract void checkProperties() throws ConfigPropertiesIllegalException;
+
     public String getClusterName() {
         return clusterName;
     }
@@ -68,4 +72,5 @@ public String getBindIp() {
     public void setBindIp(String bindIp) {
         this.bindIp = bindIp;
     }
+
 }

lts-core/src/main/java/com/github/ltsopensource/core/cluster/AbstractJobNode.java

@@ -148,13 +148,6 @@ protected void initConfig() {
             AbstractCompiler.setCompiler(compiler);
         }
 
-        appContext.setEventCenter(ServiceLoader.load(EventCenter.class, config));
-
-        appContext.setCommandBodyWrapper(new CommandBodyWrapper(config));
-        appContext.setMasterElector(new MasterElector(appContext));
-        appContext.getMasterElector().addMasterChangeListener(masterChangeListeners);
-        appContext.setRegistryStatMonitor(new RegistryStatMonitor(appContext));
-
         if (StringUtils.isEmpty(config.getIp())) {
             config.setIp(NetUtils.getLocalHost());
         }
@@ -163,6 +156,13 @@ protected void initConfig() {
 
         LOGGER.info("Current Node config :{}", config);
 
+        appContext.setEventCenter(ServiceLoader.load(EventCenter.class, config));
+
+        appContext.setCommandBodyWrapper(new CommandBodyWrapper(config));
+        appContext.setMasterElector(new MasterElector(appContext));
+        appContext.getMasterElector().addMasterChangeListener(masterChangeListeners);
+        appContext.setRegistryStatMonitor(new RegistryStatMonitor(appContext));
+
         // 订阅的node管理
         SubscribedNodeManager subscribedNodeManager = new SubscribedNodeManager(appContext);
         appContext.setSubscribedNodeManager(subscribedNodeManager);

lts-core/src/main/java/com/github/ltsopensource/core/cluster/AbstractNodeBuilder.java

@@ -0,0 +1,58 @@
+package com.github.ltsopensource.core.cluster;
+
+import com.github.ltsopensource.core.listener.MasterChangeListener;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * @author Robert HG ([email protected]) on 4/21/16.
+ */
+@SuppressWarnings("unchecked")
+public abstract class AbstractNodeBuilder<T extends AbstractJobNode, B extends NodeBuilder> implements NodeBuilder<T> {
+
+    protected List<MasterChangeListener> masterChangeListeners;
+    private AtomicBoolean built = new AtomicBoolean(false);
+    protected String[] locations;
+
+    public final B setPropertiesConfigure(String... locations) {
+        if (locations == null || locations.length == 0) {
+            throw new IllegalArgumentException("locations can not null");
+        }
+        this.locations = locations;
+        return (B) this;
+    }
+
+    public B addMasterChangeListener(MasterChangeListener masterChangeListener) {
+        if (masterChangeListener != null) {
+            if (masterChangeListeners == null) {
+                masterChangeListeners = new ArrayList<MasterChangeListener>();
+            }
+            masterChangeListeners.add(masterChangeListener);
+        }
+        return (B) this;
+    }
+
+    private void checkLocations() {
+        if (locations == null || locations.length == 0) {
+            throw new IllegalArgumentException("locations can not null");
+        }
+    }
+
+    public final T build() {
+        if (!built.compareAndSet(false, true)) {
+            throw new IllegalStateException("Already Built");
+        }
+        checkLocations();
+        T node = build0();
+        if (masterChangeListeners != null) {
+            for (MasterChangeListener masterChangeListener : masterChangeListeners) {
+                node.addMasterChangeListener(masterChangeListener);
+            }
+        }
+        return node;
+    }
+
+    protected abstract T build0();
+}

lts-core/src/main/java/com/github/ltsopensource/core/cluster/NodeBuilder.java

@@ -0,0 +1,10 @@
+package com.github.ltsopensource.core.cluster;
+
+/**
+ * @author Robert HG ([email protected]) on 4/21/16.
+ */
+public interface NodeBuilder<T> {
+
+    T build();
+
+}