[anno] [add missing junit dependency & DIcomponent]

leobert-lan · leobert-lan · commit be26d30b0f08 · 2017-09-18T22:37:05.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,7 +27,7 @@ android {
 dependencies {
     compile project(':componentservice')
 
-    annotationProcessor project(':router-anno-compiler')
+//    annotationProcessor project(':router-anno-compiler')
 }
 
 combuild {
diff --git a/app/gradle.properties b/app/gradle.properties
@@ -13,6 +13,6 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 isRunAlone=true
 debugComponent=readercomponent,com.mrzhang.share:sharecomponent
-compileComponent=readercomponent,sharecomponent,jsoncomponent
+compileComponent=readercomponent,sharecomponent,jsoncomponent,dicomponent
 
 
diff --git a/basicres/build.gradle b/basicres/build.gradle
@@ -25,4 +25,8 @@ android {
 
 dependencies {
     compile project(':basiclib')
+    testCompile 'junit:junit:4.12'
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
 }
diff --git a/componentlib/build.gradle b/componentlib/build.gradle
@@ -27,6 +27,11 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:26.+'
+
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    testCompile 'junit:junit:4.12'
 }
 
 
diff --git a/componentlib/src/main/java/com/mrzhang/component/componentlib/router/Router.java b/componentlib/src/main/java/com/mrzhang/component/componentlib/router/Router.java
@@ -8,9 +8,9 @@
 import java.util.HashMap;
 
 /**
+ * Center router, works for component-dynamic-load/remove and services add/remove/get
  * Created by mrzhang on 2017/6/15.
  */
-
 public class Router {
 
     private HashMap<String, Object> services = new HashMap<>();
@@ -33,6 +33,7 @@ public static Router getInstance() {
         return instance;
     }
 
+
     public synchronized void addService(String serviceName, Object serviceImpl) {
         if (serviceName == null || serviceImpl == null) {
             return;
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
@@ -0,0 +1,28 @@
+package com.mrzhang.component.componentlib.router;
+
+/**
+ * <p><b>Package:</b> com.mrzhang.component.componentlib.router </p>
+ * <p><b>Project:</b> DDComponentForAndroid </p>
+ * <p><b>Classname:</b> RouterConstants </p>
+ * <p><b>Description:</b> TODO </p>
+ * Created by leobert on 2017/9/18.
+ */
+
+public class RouterConstants {
+    public static final String SDK_NAME = "Router";
+    public static final String TAG = SDK_NAME + "::";
+    public static final String SEPARATOR = "$$";
+    public static final String SUFFIX_ROOT = "Root";
+    public static final String SUFFIX_INTERCEPTORS = "Interceptors";
+    public static final String SUFFIX_PROVIDERS = "Providers";
+    public static final String SUFFIX_AUTOWIRED = SEPARATOR + SDK_NAME + SEPARATOR + "Autowired";
+    public static final String DOT = ".";
+
+//    public static final String ROUTE_ROOT_PAKCAGE = "com.alibaba.android.arouter.routes";
+//
+//    public static final String AROUTER_SP_CACHE_KEY = "SP_AROUTER_CACHE";
+//    public static final String AROUTER_SP_KEY_MAP = "ROUTER_MAP";
+//
+//    public static final String LAST_VERSION_NAME = "LAST_VERSION_NAME";
+//    public static final String LAST_VERSION_CODE = "LAST_VERSION_CODE";
+}
diff --git a/componentlib/src/main/java/com/mrzhang/component/componentlib/router/facade/ISyringe.java b/componentlib/src/main/java/com/mrzhang/component/componentlib/router/facade/ISyringe.java
@@ -0,0 +1,13 @@
+package com.mrzhang.component.componentlib.router.facade;
+
+/**
+ * <p><b>Package:</b> com.mrzhang.component.componentlib.router.facade </p>
+ * <p><b>Project:</b> DDComponentForAndroid </p>
+ * <p><b>Classname:</b> ISyringe </p>
+ * <p><b>Description:</b> TODO </p>
+ * Created by leobert on 2017/9/18.
+ */
+
+public interface ISyringe {
+    void inject(Object self);
+}
diff --git a/componentservice/build.gradle b/componentservice/build.gradle
@@ -25,4 +25,9 @@ dependencies {
     compile project(':componentlib')
     compile project(':basicres')
     compile fileTree(dir: 'libs', include: ['*.jar'])
+
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    testCompile 'junit:junit:4.12'
 }
diff --git a/componentservice/src/main/java/com/mrzhang/componentservice/di/AutowiredService.java b/componentservice/src/main/java/com/mrzhang/componentservice/di/AutowiredService.java
@@ -0,0 +1,18 @@
+package com.mrzhang.componentservice.di;
+
+/**
+ * <p><b>Package:</b> com.mrzhang.componentservice.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);
+}
diff --git a/dicomponent/.gitignore b/dicomponent/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/dicomponent/build.gradle b/dicomponent/build.gradle
@@ -0,0 +1,38 @@
+apply plugin: 'com.dd.comgradle'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 14
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            minifyEnabled false
+        }
+    }
+    resourcePrefix "di_"
+}
+
+dependencies {
+    compile project(':componentservice')
+
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    testCompile 'junit:junit:4.12'
+}
+
+combuild {
+    applicatonName = 'com.ljsw.component.di.runalone.application.DIApplication'
+    isRegisterCompoAuto = true
+}
diff --git a/dicomponent/gradle.properties b/dicomponent/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+isRunAlone=true
diff --git a/dicomponent/proguard-rules.pro b/dicomponent/proguard-rules.pro
@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/leobert/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/dicomponent/src/androidTest/java/com/ljsw/component/di/ExampleInstrumentedTest.java b/dicomponent/src/androidTest/java/com/ljsw/component/di/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.ljsw.component.di;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.ljsw.component.di.test", appContext.getPackageName());
+    }
+}
diff --git a/dicomponent/src/main/AndroidManifest.xml b/dicomponent/src/main/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+    package="com.ljsw.component.di">
+
+    <application android:allowBackup="true" android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
diff --git a/dicomponent/src/main/java/com/ljsw/component/di/applike/DepInjectAppLike.java b/dicomponent/src/main/java/com/ljsw/component/di/applike/DepInjectAppLike.java
@@ -0,0 +1,25 @@
+package com.ljsw.component.di.applike;
+
+import com.mrzhang.component.componentlib.applicationlike.IApplicationLike;
+
+/**
+ * <p><b>Package:</b> com.ljsw.component.di.applike </p>
+ * <p><b>Project:</b> DDComponentForAndroid </p>
+ * <p><b>Classname:</b> DepInjectAppLike </p>
+ * <p><b>Description:</b> TODO </p>
+ * Created by leobert on 2017/9/18.
+ */
+
+public class DepInjectAppLike implements IApplicationLike {
+    //nothing for router
+
+    @Override
+    public void onCreate() {
+
+    }
+
+    @Override
+    public void onStop() {
+
+    }
+}
diff --git a/dicomponent/src/main/java/com/ljsw/component/di/serviceimpl/AutowiredServiceImpl.java b/dicomponent/src/main/java/com/ljsw/component/di/serviceimpl/AutowiredServiceImpl.java
@@ -0,0 +1,44 @@
+package com.ljsw.component.di.serviceimpl;
+
+import android.util.LruCache;
+
+import com.mrzhang.component.componentlib.router.facade.ISyringe;
+import com.mrzhang.componentservice.di.AutowiredService;
+
+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>
+ * <p><b>Project:</b> DDComponentForAndroid </p>
+ * <p><b>Classname:</b> DepInjectServiceImpl </p>
+ * <p><b>Description:</b> TODO </p>
+ * Created by leobert on 2017/9/18.
+ */
+
+public class AutowiredServiceImpl implements AutowiredService {
+
+    private LruCache<String, ISyringe> classCache = new LruCache<>(50);
+    private List<String> blackList = new ArrayList<>();
+
+
+    @Override
+    public void autowire(Object instance) {
+        String className = instance.getClass().getName();
+        try {
+            if (!blackList.contains(className)) {
+                ISyringe autowiredHelper = classCache.get(className);
+                if (null == autowiredHelper) {  // No cache.
+                    autowiredHelper = (ISyringe) Class.forName(instance.getClass().getName() + SUFFIX_AUTOWIRED)
+                            .getConstructor().newInstance();
+                }
+                autowiredHelper.inject(instance);
+                classCache.put(className, autowiredHelper);
+            }
+        } catch (Exception ex) {
+            blackList.add(className);    // This instance need not autowired.
+        }
+    }
+}
diff --git a/dicomponent/src/main/res/values/strings.xml b/dicomponent/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">dicomponent</string>
+</resources>
diff --git a/dicomponent/src/main/runalone/AndroidManifest.xml b/dicomponent/src/main/runalone/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+    package="com.ljsw.component.json">
+
+    <application
+        android:name=".runalone.application.DIApplication"
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
diff --git a/dicomponent/src/main/runalone/java/com/ljsw/component/di/runalone/application/DIApplication.java b/dicomponent/src/main/runalone/java/com/ljsw/component/di/runalone/application/DIApplication.java
@@ -0,0 +1,14 @@
+package com.ljsw.component.di.runalone.application;
+
+import android.app.Application;
+
+/**
+ * <p><b>Package:</b> com.ljsw.component.json.runalone.application </p>
+ * <p><b>Project:</b> DDComponentForAndroid </p>
+ * <p><b>Classname:</b> JsonApplication </p>
+ * <p><b>Description:</b> TODO </p>
+ * Created by leobert on 2017/9/18.
+ */
+
+public class DIApplication extends Application {
+}
diff --git a/dicomponent/src/main/runalone/res/values/strings.xml b/dicomponent/src/main/runalone/res/values/strings.xml
@@ -0,0 +1,2 @@
+<resources>
+</resources>
diff --git a/dicomponent/src/test/java/com/ljsw/component/di/ExampleUnitTest.java b/dicomponent/src/test/java/com/ljsw/component/di/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.ljsw.component.di;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
diff --git a/jsoncompnent/build.gradle b/jsoncompnent/build.gradle
@@ -26,6 +26,11 @@ android {
 dependencies {
     compile project(':componentservice')
     compile 'com.alibaba:fastjson:1.1.63.android'
+
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    testCompile 'junit:junit:4.12'
 }
 
 combuild {
diff --git a/jsoncompnent/src/main/runalone/res/values/strings.xml b/jsoncompnent/src/main/runalone/res/values/strings.xml
@@ -0,0 +1,2 @@
+<resources>
+</resources>
diff --git a/readercomponent/build.gradle b/readercomponent/build.gradle
diff --git a/settings.gradle b/settings.gradle
diff --git a/sharecomponent/build.gradle b/sharecomponent/build.gradle
diff --git a/sharecomponent/src/main/java/com/mrzhang/share/ShareActivity.java b/sharecomponent/src/main/java/com/mrzhang/share/ShareActivity.java

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ android {`
`27`	`27`	`dependencies {`
`28`	`28`	`compile project(':componentservice')`
`29`	`29`
`30`		`- annotationProcessor project(':router-anno-compiler')`
	`30`	`+// annotationProcessor project(':router-anno-compiler')`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`combuild {`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,8 @@ android {`
`25`	`25`
`26`	`26`	`dependencies {`
`27`	`27`	`compile project(':basiclib')`
	`28`	`+ testCompile 'junit:junit:4.12'`
	`29`	`+ androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {`
	`30`	`+ exclude group: 'com.android.support', module: 'support-annotations'`
	`31`	`+ })`
`28`	`32`	`}`