[anno] [change di&json to basicLib]

leobert-lan · leobert-lan · commit 6ed700e468ad · 2017-09-20T22:03:17.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,11 +26,6 @@ android {
 
 dependencies {
     compile project(':componentservice')
-
-    compile project(':jsonlib')
-
-    compile project(':dilib')
-
 //    annotationProcessor project(':router-anno-compiler')
 }
 
diff --git a/app/src/main/java/com/mrzhang/component/application/AppApplication.java b/app/src/main/java/com/mrzhang/component/application/AppApplication.java
@@ -2,12 +2,6 @@
 
 import android.app.Application;
 
-import com.ljsw.component.di.serviceimpl.AutowiredServiceImpl;
-import com.ljsw.component.json.serviceimpl.JsonServiceImpl;
-import com.mrzhang.component.componentlib.router.Router;
-import com.mrzhang.componentservice.di.AutowiredService;
-import com.mrzhang.componentservice.json.JsonService;
-
 /**
  * Created by mrzhang on 2017/6/15.
  */
@@ -21,14 +15,6 @@ public void onCreate() {
         //如果isRegisterCompoAuto为false，则需要通过反射加载组件
 //        Router.registerComponent("com.mrzhang.reader.applike.ReaderAppLike");
 //        Router.registerComponent("com.mrzhang.share.applike.ShareApplike");
-
-        // register jsonService
-        Router.getInstance().addService(JsonService.class.getSimpleName(),
-                new JsonServiceImpl());
-
-        // register DI-AutowiredService
-        Router.getInstance().addService(AutowiredService.class.getSimpleName(),
-                new AutowiredServiceImpl());
     }
 
 
diff --git a/componentlib/src/main/java/com/mrzhang/component/componentlib/router/RouterConstants.java b/componentlib/src/main/java/com/mrzhang/component/componentlib/router/RouterConstants.java
diff --git a/componentservice/build.gradle b/componentservice/build.gradle
@@ -24,6 +24,8 @@ android {
 dependencies {
     compile project(':componentlib')
     compile project(':basicres')
+    compile project(':jsonlib')
+    compile project(':dilib')
     compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
diff --git a/componentservice/src/main/java/com/mrzhang/componentservice/di/AutowiredService.java b/componentservice/src/main/java/com/mrzhang/componentservice/di/AutowiredService.java
diff --git a/dilib/build.gradle b/dilib/build.gradle
@@ -22,8 +22,6 @@ android {
 }
 
 dependencies {
-    compile project(':componentservice')
-
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
diff --git a/dilib/src/main/java/com/ljsw/component/di/AutowiredService.java b/dilib/src/main/java/com/ljsw/component/di/AutowiredService.java
@@ -0,0 +1,36 @@
+package com.ljsw.component.di;
+
+import com.ljsw.component.di.serviceimpl.AutowiredServiceImpl;
+
+/**
+ * <p><b>Package:</b> com.ljsw.component.di </p>
+ * <p><b>Project:</b> DDComponentForAndroid </p>
+ * <p><b>Classname:</b> AutowiredService </p>
+ * <p><b>Description:</b> Autowired Dependency inject </p>
+ * Created by leobert on 2017/9/18.
+ */
+
+public interface AutowiredService {
+
+    /**
+     * Autowired core.
+     * @param instance the instance who need autowired.
+     */
+    void autowire(Object instance);
+
+
+    class Factory {
+        private static Factory instance;
+
+        public static Factory getInstance() {
+            if (instance == null) {
+                instance = new Factory();
+            }
+            return instance;
+        }
+
+        public AutowiredService create() {
+            return new AutowiredServiceImpl();
+        }
+    }
+}
diff --git a/dilib/src/main/java/com/ljsw/component/di/route/ISyringe.java b/dilib/src/main/java/com/ljsw/component/di/route/ISyringe.java
@@ -1,7 +1,7 @@
-package com.mrzhang.component.componentlib.router.facade;
+package com.ljsw.component.di.route;
 
 /**
- * <p><b>Package:</b> com.mrzhang.component.componentlib.router.facade </p>
+ * <p><b>Package:</b> com.ljsw.component.di.route </p>
  * <p><b>Project:</b> DDComponentForAndroid </p>
  * <p><b>Classname:</b> ISyringe </p>
  * <p><b>Description:</b> desc the function of Syringe, one that used to inject
diff --git a/dilib/src/main/java/com/ljsw/component/di/serviceimpl/AutowiredServiceImpl.java b/dilib/src/main/java/com/ljsw/component/di/serviceimpl/AutowiredServiceImpl.java
@@ -2,13 +2,12 @@
 
 import android.util.LruCache;
 
-import com.mrzhang.component.componentlib.router.facade.ISyringe;
-import com.mrzhang.componentservice.di.AutowiredService;
+import com.ljsw.component.di.AutowiredService;
+import com.ljsw.component.di.route.ISyringe;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.mrzhang.component.componentlib.router.RouterConstants.SUFFIX_AUTOWIRED;
 
 /**
  * <p><b>Package:</b> com.ljsw.component.di.serviceimpl </p>
@@ -24,6 +23,8 @@ public class AutowiredServiceImpl implements AutowiredService {
     private LruCache<String, ISyringe> classCache = new LruCache<>(50);
     private List<String> blackList = new ArrayList<>();
 
+    //attention! make sure this keeps same with the one in AutowiredProcessor
+    private static final String SUFFIX_AUTOWIRED = "$$Router$$Autowired";
 
     @Override
     public void autowire(Object instance) {
diff --git a/jsonlib/build.gradle b/jsonlib/build.gradle
@@ -22,7 +22,6 @@ android {
 }
 
 dependencies {
-    compile project(':componentservice')
     compile 'com.alibaba:fastjson:1.1.63.android'
 
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
diff --git a/jsonlib/src/main/java/com/ljsw/component/json/JsonService.java b/jsonlib/src/main/java/com/ljsw/component/json/JsonService.java
@@ -1,9 +1,11 @@
-package com.mrzhang.componentservice.json;
+package com.ljsw.component.json;
+
+import com.ljsw.component.json.serviceimpl.JsonServiceImpl;
 
 import java.util.List;
 
 /**
- * <p><b>Package:</b> com.mrzhang.componentservice.json </p>
+ * <p><b>Package:</b> com.ljsw.component.json </p>
  * <p><b>Project:</b> DDComponentForAndroid </p>
  * <p><b>Classname:</b> JsonService </p>
  * <p><b>Description:</b> APIs provided by the JsonComponent.
@@ -22,4 +24,19 @@ public interface JsonService {
 
     String toJsonString(Object instance);
 
+    class Factory {
+        private static Factory instance;
+
+        public static Factory getInstance() {
+            if (instance == null) {
+                instance = new Factory();
+            }
+            return instance;
+        }
+
+        public JsonService create() {
+            return new JsonServiceImpl();
+        }
+    }
+
 }
diff --git a/jsonlib/src/main/java/com/ljsw/component/json/serviceimpl/JsonServiceImpl.java b/jsonlib/src/main/java/com/ljsw/component/json/serviceimpl/JsonServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ljsw.component.json.serviceimpl;
 
 import com.alibaba.fastjson.JSON;
-import com.mrzhang.componentservice.json.JsonService;
+import com.ljsw.component.json.JsonService;
 
 import java.util.List;
 
diff --git a/router-anno-compiler/src/main/java/com/ljsw/router/compiler/processor/AutowiredProcessor.java b/router-anno-compiler/src/main/java/com/ljsw/router/compiler/processor/AutowiredProcessor.java
@@ -81,6 +81,7 @@ public class AutowiredProcessor extends AbstractProcessor {
     //    private static final ClassName ARouterClass = ClassName.get("com.alibaba.android.arouter.launcher", "ARouter");
     private static final ClassName AndroidLog = ClassName.get("android.util", "Log");
 
+    private static final String SUFFIX_AUTOWIRED = "$$Router$$Autowired";
 
     @Override
     public synchronized void init(ProcessingEnvironment processingEnvironment) {
@@ -140,7 +141,7 @@ private void generateHelper() throws IOException, IllegalAccessException {
                 String qualifiedName = parent.getQualifiedName().toString();
                 String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf("."));
 
-                String fileName = parent.getSimpleName() + "$$Router$$" + "Autowired";
+                String fileName = parent.getSimpleName() + SUFFIX_AUTOWIRED;
 
                 logger.info(">>> Start process " + childs.size() + " field in " + parent.getSimpleName() + " ... <<<");
 
@@ -153,14 +154,6 @@ private void generateHelper() throws IOException, IllegalAccessException {
                         "jsonService", Modifier.PRIVATE).build();
                 helper.addField(jsonServiceField);
 
-                /*
-                * Router router = Router.getInstance();
-                    if (router.getService(JsonService.class.getSimpleName()) != null) {
-                        JsonService jsonService = (JsonService) router.getService(JsonService.class.getSimpleName());
-                    } else {
-                        throw new IllegalStateException("JsonService not found in Router");
-                    }
-                * */
 
 //                String _statement =
 //                        " $T router = $T.getInstance();\n" +
diff --git a/sharecomponent/src/main/java/com/mrzhang/share/ShareActivity.java b/sharecomponent/src/main/java/com/mrzhang/share/ShareActivity.java
@@ -6,11 +6,11 @@
 import android.util.Log;
 import android.widget.TextView;
 
+import com.ljsw.component.di.AutowiredService;
+import com.ljsw.component.json.JsonService;
 import com.ljsw.router.facade.annotation.Autowired;
 import com.ljsw.router.facade.annotation.RouteNode;
 import com.mrzhang.component.componentlib.router.Router;
-import com.mrzhang.componentservice.di.AutowiredService;
-import com.mrzhang.componentservice.json.JsonService;
 
 /**
  * Created by mrzhang on 2017/6/20.
@@ -38,25 +38,25 @@ public void setS(String s) {
     @Autowired
     TestDto testDto;
 
+    private JsonService jsonService = JsonService.Factory.getInstance().create();
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.share_activity_share);
 //        UIRouter.getInstance().inject
 
         Router router = Router.getInstance();
-        if (router.getService(AutowiredService.class.getSimpleName()) != null) {
-            AutowiredService service = (AutowiredService) router.getService(AutowiredService.class.getSimpleName());
-            service.autowire(this);
-        }
+//        if (router.getService(AutowiredService.class.getSimpleName()) != null) {
+//            AutowiredService service = (AutowiredService) router.getService(AutowiredService.class.getSimpleName());
+//            service.autowire(this);
+//        }
 
 
         TextView textView = (TextView) findViewById(R.id.share_tv_tag);
         textView.setText("share: " + bookName);
 
-        Log.d(TAG,"dto:\r"+((JsonService)Router.getInstance()
-                .getService(JsonService.class.getSimpleName()))
-                .toJsonString(testDto));
+        Log.d(TAG,"dto:\r"+(jsonService.toJsonString(testDto));
 
     }
 

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`
`25`		`- compile project(':componentservice')`
`26`		`-`
`27`	`25`	`androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {`
`28`	`26`	`exclude group: 'com.android.support', module: 'support-annotations'`
`29`	`27`	`})`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`
`25`		`- compile project(':componentservice')`
`26`	`25`	`compile 'com.alibaba:fastjson:1.1.63.android'`
`27`	`26`
`28`	`27`	`androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {`