Merge pull request #3 from codeLief/trunk

ankang

Author: codeLief

src/main/java/com/ankang/report/config/ReportConfig.java

@@ -127,7 +127,7 @@ public static boolean dynamicLoadConfig(String key, Object value) {
 
 	public static boolean containsKey(String key) {
 		if (null == key) {
-			logger.warn("key is null");
+			logger.error("key is null");
 			return Boolean.FALSE;
 		}
 		return REPORTCONFIG.containsKey(key);

src/main/java/com/ankang/report/example/Example.java

@@ -59,7 +59,7 @@ public TestResponse check(@ReportParam(value = "testRequest") TestRequest testRe
 	@HTTP(value = "checkMap", desc = "例子")
 	public void checkMap(Map<String, Object> params){
 
-		
+		System.out.println("进入方法");
 		for (Map.Entry<String, Object> param : params.entrySet()) {
 			System.out.println("key:"+param.getKey()+"  value:"+param.getValue());
 		}

src/main/java/com/ankang/report/factory/ObjBeanFactory.java

@@ -41,7 +41,7 @@ public synchronized Object createBean(Class<?> clazz){
 			return null;
 		}
 		Object object = null;
-		object = BeanUtil.getBean(null, clazz);
+		object = BeanUtil.getBean(clazz);
 		if(null != object){
 			return object;
 		}

src/main/java/com/ankang/report/main/handler/impl/ReportRequestHandler.java

@@ -69,7 +69,6 @@ public ReportResponse handler(String serviceAlias, String methodAlias,
 		return startInvoke.invoke(request, invocation);
 	}
 
-	// 暂不支持map，数组封装 可通过滤器自定义 或自定义end_invoke
 	@Override
 	public ReportResponse invoke(HttpServletRequest request,
 			Invocation invocation) throws Exception {

src/main/java/com/ankang/report/register/impl/ResolverRegister.java

@@ -29,6 +29,8 @@
 import com.ankang.report.pool.AbstractReportAliasPool;
 import com.ankang.report.register.ReportRegister;
 import com.ankang.report.resolver.ReportResolver;
+import com.ankang.report.resolver.impl.JsonProtocolResolver;
+import com.ankang.report.resolver.impl.XmlProtocolResolver;
 import com.ankang.report.util.ReportUtil;
 
 @SuppressWarnings("all")
@@ -41,10 +43,10 @@ public final class ResolverRegister extends AbstractReportAliasPool implements R
 
 	@Override
 	public boolean reginster() {
-		List<Class<?>> resolverAll = ReportUtil.getAllClassByInterface(ReportResolver.class);
-		for (Class<?> clazz : resolverAll) {
-			configer(clazz);
-		}
+		
+		configer(JsonProtocolResolver.class);
+		configer(XmlProtocolResolver.class);
+		
 		ReportCabinet.getReportApplicationContext().putPool(POOL_ALIAS_NAME, RESOLVERPOOL);
 		return Boolean.TRUE;
 	}

src/main/java/com/ankang/report/util/BeanUtil.java

@@ -34,25 +34,18 @@ public void setApplicationContext(ApplicationContext applicationContext)throws B
 		 context = applicationContext;
 	 }
 
-	 public synchronized static Object getBean(String beanName, Class<?> beanCalzz) {
-		 
+	 public synchronized static Object getBean(String beanName) {
 		 try {
-			 Object object = null;
-			 if(StringUtils.isNotEmpty(beanName)){
-				 if((object = context.getBean(beanName)) != null){
-					 return object;
-				 }
-			 }else{
-				 return context.getBean(beanCalzz);
-			 }
-			
-		} catch (BeansException e) {
-			 try {
-				return context.getBean(beanCalzz);
-			} catch (BeansException f) {
+			if(StringUtils.isEmpty(beanName)){
 				return null;
 			}
+			return context.getBean(beanName);
+		} catch (BeansException e) {
+			 return null;
 		}
-		 return null;
+		
+	 }
+	 public synchronized static Object getBean(Class<?> beanCalzz){
+		 return context.getBeansOfType(beanCalzz);
 	 }
 }

src/main/java/com/ankang/report/util/FutrueProxy.java

@@ -0,0 +1,103 @@
+package com.ankang.report.util;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.log4j.Logger;
+
+
+/**
+ * @author ankang
+ * @time 2016-1-10
+ */
+public class FutrueProxy{
+	
+	private static final Logger logger = Logger.getLogger(FutrueProxy.class);
+	
+	private ExecutorService service;
+	
+	public FutrueProxy(int nThreads){
+		
+		if(nThreads > 0){
+			
+			service = new ThreadPoolExecutor(nThreads, nThreads, 60L, TimeUnit.SECONDS,
+		            new SynchronousQueue<Runnable>());
+		}else{
+			service = Executors.newCachedThreadPool();
+		}
+	}
+	
+	/**
+	 * 
+	 * @author ankang
+	 * @time 2016-1-10
+	 * @param targerService 目标类
+	 * @param targerMethod 目标方法名称 注：不要有方法名称一样，参数个数一样的本类认为重复的方法。
+	 * @param resultType 返回值类型
+	 * @param args 参数，与实际方法参数类型，顺序一致。
+	 * @return 返回Future 通过get()获取真实返回值，此方法为阻塞方法
+	 */
+	public <T> Future<T> excute(final Object targerService, final String targerMethod, final Class<T> resultType, final Object...args) {
+		
+		Future<T> real = service.submit(new Callable<T>() {
+
+			@Override
+			public T call() throws Exception {
+				
+				try {
+					
+					Method method = getMethod(targerService, targerMethod, args);
+					
+					return (T)method.invoke(targerService, args);
+				} catch (Exception e) {
+					
+					logger.error(String.format("并行调用失败  targetService:[%s], targetMethod:[%s], args:[%s]",
+							targerService, targerMethod, args), e);
+					throw e;
+				} 
+			}
+		});
+		
+		return real;
+	}
+	
+	public void excute(final Object targerService, final String targerMethod, final Object...args){
+		
+		service.execute(new Runnable() {
+			
+			@Override
+			public void run(){
+				try {
+					getMethod(targerService, targerMethod, args).invoke(targerService, args);
+					
+				} catch (Exception e) {
+					logger.error(String.format("并行调用失败  targetService:[%s], targetMethod:[%s], args:[%s]",targerService, 
+								targerMethod, args), e);
+				}
+				
+			}
+		});
+		
+	}
+	private Method getMethod(Object targer, String targerMethod, Object...args){
+		
+		if(args == null){
+			args = new Object[0];
+		}
+		int i = 0;
+		Method[] methods = targer.getClass().getMethods();
+		for (; i < methods.length; i++) {
+			if(targerMethod.equals(methods[i].getName()) 
+					&& args.length == methods[i].getParameterTypes().length){
+				break;
+			}
+		}
+		return methods[i];
+	}
+}