From ba07d343ae95cfb4ac684f9b335e24c29bee1484 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 10 Oct 2016 17:52:15 +0800
Subject: [PATCH]

---
 src/org/redkale/net/sncp/Sncp.java            | 30 +++++++++----------
 src/org/redkale/net/sncp/SncpDyn.java         |  4 +--
 .../redkale/service/CacheSourceService.java   | 20 ++++++-------
 .../service/DataCacheListenerService.java     |  6 ++--
 .../{MultiRun.java => RpcMultiRun.java}       |  4 +--
 5 files changed, 32 insertions(+), 32 deletions(-)
 rename src/org/redkale/service/{MultiRun.java => RpcMultiRun.java} (88%)

diff --git a/src/org/redkale/net/sncp/Sncp.java b/src/org/redkale/net/sncp/Sncp.java
index be4fc21bd..5cdb6c268 100644
--- a/src/org/redkale/net/sncp/Sncp.java
+++ b/src/org/redkale/net/sncp/Sncp.java
@@ -138,17 +138,17 @@ public abstract class Sncp {
      *          return "hello";
      *      }
      *
-     *      &#64;MultiRun(selfrun = false)
-     *      public void createSomeThing(TestBean bean){
-     *          //do something
-     *      }
-     *
-     *      &#64;MultiRun
-     *      public String updateSomeThing(String id){
-     *          return "hello" + id;
-     *      }
-     * }
-     * </pre></blockquote>
+     *      &#64;RpcMultiRun(selfrun = false)
+      public void createSomeThing(TestBean bean){
+          //do something
+      }
+
+      &#64;RpcMultiRun
+      public String updateSomeThing(String id){
+          return "hello" + id;
+      }
+ }
+ </pre></blockquote>
      *
      * <blockquote><pre>
      * &#64;Resource(name = "")
@@ -339,7 +339,7 @@ public abstract class Sncp {
         }
         int i = - 1;
         for (final Method method : methods) {
-            final MultiRun mrun = method.getAnnotation(MultiRun.class);
+            final RpcMultiRun mrun = method.getAnnotation(RpcMultiRun.class);
             if (mrun == null) continue;
             final Class returnType = method.getReturnType();
             final String methodDesc = Type.getMethodDescriptor(method);
@@ -352,7 +352,7 @@ public abstract class Sncp {
                     final Annotation[][] anns = method.getParameterAnnotations();
                     for (int k = 0; k < anns.length; k++) {
                         for (Annotation ann : anns[k]) {
-                            if (ann instanceof SncpDyn || ann instanceof MultiRun) continue; //必须过滤掉 MultiRun、SncpDyn，否则生成远程模式Service时会出错
+                            if (ann instanceof SncpDyn || ann instanceof RpcMultiRun) continue; //必须过滤掉 RpcMultiRun、SncpDyn，否则生成远程模式Service时会出错
                             visitAnnotation(mv.visitParameterAnnotation(k, Type.getDescriptor(ann.annotationType()), true), ann);
                         }
                     }
@@ -405,7 +405,7 @@ public abstract class Sncp {
                     final Annotation[][] anns = method.getParameterAnnotations();
                     for (int k = 0; k < anns.length; k++) {
                         for (Annotation ann : anns[k]) {
-                            if (ann instanceof SncpDyn || ann instanceof MultiRun) continue; //必须过滤掉 MultiRun、SncpDyn，否则生成远程模式Service时会出错
+                            if (ann instanceof SncpDyn || ann instanceof RpcMultiRun) continue; //必须过滤掉 RpcMultiRun、SncpDyn，否则生成远程模式Service时会出错
                             visitAnnotation(mv.visitParameterAnnotation(k, Type.getDescriptor(ann.annotationType()), true), ann);
                         }
                     }
@@ -811,7 +811,7 @@ public abstract class Sncp {
                     }
                     sb.append(", diffaddrs = ").append(addrs);
                 } else {
-                    sb.append(", ").append(MultiRun.class.getSimpleName().toLowerCase()).append(" = false");
+                    sb.append(", ").append(RpcMultiRun.class.getSimpleName().toLowerCase()).append(" = false");
                 }
                 sb.append("}");
                 Field s = newClazz.getDeclaredField(FIELDPREFIX + "_selfstring");
diff --git a/src/org/redkale/net/sncp/SncpDyn.java b/src/org/redkale/net/sncp/SncpDyn.java
index 4cb3bb944..19286266f 100644
--- a/src/org/redkale/net/sncp/SncpDyn.java
+++ b/src/org/redkale/net/sncp/SncpDyn.java
@@ -11,8 +11,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * 修饰由SNCP协议动态生成的class、和method
- * 本地模式：动态生成的_DynLocalXXXXService类其带有@MultiRun方法均会打上@SncpDyn(remote = false, index=N) 的注解
- * 远程模式：动态生成的_DynRemoteXXXService类会打上@SncpDyn(remote = true) 的注解
+ * 本地模式：动态生成的_DynLocalXXXXService类其带有&#64;RpcMultiRun方法均会打上@SncpDyn(remote = false, index=N) 的注解
+ * 远程模式：动态生成的_DynRemoteXXXService类会打上&#64;SncpDyn(remote = true) 的注解
  *
  * <p> 详情见: http://redkale.org
  * @author zhangjx
diff --git a/src/org/redkale/service/CacheSourceService.java b/src/org/redkale/service/CacheSourceService.java
index b2fdd26b6..f63ccede8 100644
--- a/src/org/redkale/service/CacheSourceService.java
+++ b/src/org/redkale/service/CacheSourceService.java
@@ -202,7 +202,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public V getAndRefresh(K key, final int expireSeconds) {
         if (key == null) return null;
         CacheEntry entry = container.get(key);
@@ -215,7 +215,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void refresh(K key, final int expireSeconds) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
@@ -225,7 +225,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void set(K key, V value) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
@@ -240,7 +240,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void set(int expireSeconds, K key, V value) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
@@ -255,7 +255,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void setExpireSeconds(K key, int expireSeconds) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
@@ -264,7 +264,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void remove(K key) {
         if (key == null) return;
         container.remove(key);
@@ -281,7 +281,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void appendListItem(K key, V value) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
@@ -297,7 +297,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void removeListItem(K key, V value) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
@@ -306,7 +306,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void appendSetItem(K key, V value) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
@@ -322,7 +322,7 @@ public class CacheSourceService<K extends Serializable, V extends Object> implem
     }
 
     @Override
-    @MultiRun
+    @RpcMultiRun
     public void removeSetItem(K key, V value) {
         if (key == null) return;
         CacheEntry entry = container.get(key);
diff --git a/src/org/redkale/service/DataCacheListenerService.java b/src/org/redkale/service/DataCacheListenerService.java
index 2c87c1baf..c0fc667f5 100644
--- a/src/org/redkale/service/DataCacheListenerService.java
+++ b/src/org/redkale/service/DataCacheListenerService.java
@@ -25,19 +25,19 @@ public class DataCacheListenerService implements DataCacheListener, Service {
     private DataSource source;
 
     @Override
-    @MultiRun(selfrun = false, async = true)
+    @RpcMultiRun(selfrun = false, async = true)
     public <T> void insertCache(Class<T> clazz, T... entitys) {
         ((DataDefaultSource) source).insertCache(clazz, entitys);
     }
 
     @Override
-    @MultiRun(selfrun = false, async = true)
+    @RpcMultiRun(selfrun = false, async = true)
     public <T> void updateCache(Class<T> clazz, T... entitys) {
         ((DataDefaultSource) source).updateCache(clazz, entitys);
     }
 
     @Override
-    @MultiRun(selfrun = false, async = true)
+    @RpcMultiRun(selfrun = false, async = true)
     public <T> void deleteCache(Class<T> clazz, Serializable... ids) {
         ((DataDefaultSource) source).deleteCache(clazz, ids);
     }
diff --git a/src/org/redkale/service/MultiRun.java b/src/org/redkale/service/RpcMultiRun.java
similarity index 88%
rename from src/org/redkale/service/MultiRun.java
rename to src/org/redkale/service/RpcMultiRun.java
index 96f31cf60..7cc04c096 100644
--- a/src/org/redkale/service/MultiRun.java
+++ b/src/org/redkale/service/RpcMultiRun.java
@@ -10,7 +10,7 @@ import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * MultiRun 只对本地模式Service有效
+ * RpcMultiRun 只对本地模式Service有效
  *
  * <p>
  * 详情见: http://redkale.org
@@ -21,7 +21,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Documented
 @Target({METHOD})
 @Retention(RUNTIME)
-public @interface MultiRun {
+public @interface RpcMultiRun {
 
     boolean selfrun() default true; //当前本地实例是否运行指定操作；只有当指定操作的方法的返回值为void时，该值才能为true，否则忽略。