feat: implement dependency injection

.gitignore

@@ -44,3 +44,5 @@ Icon
 #Ignore Windows
 ehthumbs.db
 Thumbs.db
+
+gestalt-di/test-modules/

gestalt-android-testbed/build.gradle

@@ -14,16 +14,6 @@
  * limitations under the License.
  */
 
-import com.google.common.base.Predicate
-import org.reflections.Reflections
-import org.reflections.scanners.ResourcesScanner
-import org.reflections.scanners.SubTypesScanner
-import org.reflections.scanners.TypeAnnotationsScanner
-import org.reflections.serializers.JsonSerializer
-import org.reflections.util.ConfigurationBuilder
-
-import java.util.regex.Pattern
-
 apply plugin: 'com.android.application'
 apply plugin: 'project-report'
 
@@ -41,24 +31,15 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    packagingOptions {
+        merge 'META-INF/annotations/*'
+    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    applicationVariants.all {
-        variant ->
-            def t = task("reflect${variant.name.capitalize()}") {
-                description = "Generates reflections manifest for variant ${variant.name}"
-
-                doLast {
-                    reflectPackage("org.terasology.gestalt.android.testbed.packageModuleA", variant)
-                    reflectPackage("org.terasology.gestalt.android.testbed.packageModuleB", variant)
-                }
-            }
-            variant.assembleProvider.get().dependsOn(t)
-    }
     lintOptions {
         abortOnError false
     }
@@ -78,32 +59,17 @@ dependencies {
     testImplementation "junit:junit:$junit_version"
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
+    annotationProcessor project(":gestalt-inject-java")
 }
 
-def reflectPackage(packageName, variant) {
-    def resourcesPath = variant.sourceSets.find { it.name == 'main' }.resources.srcDirs
-    def classPath = files { variant.javaCompileProvider.get().destinationDir }
-    URL[] scanUrls = classPath.collect { it.toURI().toURL() } + resourcesPath.collect {
-        it.toURI().toURL()
+// Android projects don't provide direct access to compileJava but this seems to work.
+// https://stackoverflow.com/a/42297051
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        // Adds Resources as parameter for AnnotationProcessor (gather ResourceIndex,
+        // also add resource as input for compilejava, for re-gathering ResourceIndex, when resource was changed.
+        inputs.files android.sourceSets.main.resources.srcDirs
+        options.compilerArgs = ["-Aresource=${android.sourceSets.main.resources.srcDirs.join(File.pathSeparator)}"]
     }
-    URL[] classLoaderUrls = scanUrls + variant.javaCompileProvider.get().classpath.collect {
-        it.toURI().toURL()
-    } + [new File(android.sdkDirectory, "platforms/" + android.compileSdkVersion + "/android.jar").toURI().toURL()]
-
-    ClassLoader classLoader = new URLClassLoader(classLoaderUrls, getClass().getClassLoader())
-    org.reflections.Configuration config = new ConfigurationBuilder()
-    config.addClassLoader(classLoader)
-    config.setUrls(scanUrls)
-    config.filterInputsBy(new Predicate<String>() {
-        @Override
-        boolean apply(@javax.annotation.Nullable String s) {
-            return packageName.isEmpty() || s.startsWith(packageName + ".")
-        }
-    })
-
-    config.addScanners(new ResourcesScanner(), new SubTypesScanner(false), new TypeAnnotationsScanner().filterResultsBy())
-    Reflections reflections = new Reflections(config)
-    JsonSerializer serializer = new JsonSerializer()
-    def outPath = variant.javaCompileProvider.get().destinationDir.toString() + "/" + packageName.replaceAll(Pattern.quote("."), "/") + "/manifest.json"
-    serializer.save(reflections, outPath)
 }

gestalt-android-testbed/src/main/java/org/terasology/gestalt/android/testbed/GestaltTestActivity.java

@@ -35,11 +35,13 @@
 import org.terasology.gestalt.android.testbed.assettypes.TextData;
 import org.terasology.gestalt.android.testbed.assettypes.TextFactory;
 import org.terasology.gestalt.android.testbed.assettypes.TextFileFormat;
+import org.terasology.gestalt.di.DefaultBeanContext;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleEnvironment;
 import org.terasology.gestalt.module.ModuleFactory;
 import org.terasology.gestalt.module.ModuleMetadata;
 import org.terasology.gestalt.module.ModulePathScanner;
+import org.terasology.gestalt.module.ModuleServiceRegistry;
 import org.terasology.gestalt.module.TableModuleRegistry;
 import org.terasology.gestalt.module.resources.FileReference;
 import org.terasology.gestalt.module.sandbox.StandardPermissionProviderFactory;
@@ -93,7 +95,7 @@ protected void onCreate(Bundle savedInstanceState) {
         StandardPermissionProviderFactory permissionProviderFactory = new StandardPermissionProviderFactory();
         permissionProviderFactory.getBasePermissionSet().addAPIPackage("java.lang");
         permissionProviderFactory.getBasePermissionSet().addAPIPackage("org.terasology.test.api");
-        ModuleEnvironment environment = new ModuleEnvironment(moduleRegistry, new WarnOnlyProviderFactory(permissionProviderFactory), (module, parent, permissionProvider) -> AndroidModuleClassLoader.create(module, parent, permissionProvider, getCodeCacheDir()));
+        ModuleEnvironment environment = new ModuleEnvironment(new DefaultBeanContext(new ModuleServiceRegistry(permissionProviderFactory)), moduleRegistry, new WarnOnlyProviderFactory(permissionProviderFactory), (module, parent, permissionProvider) -> AndroidModuleClassLoader.create(module, parent, permissionProvider, getCodeCacheDir()));
 
 
         displayText.append("-== Module Content ==-\n\n");

gestalt-android-testbed/src/main/res/layout/activity_gestalt_test.xml

@@ -21,14 +21,20 @@
     android:layout_height="match_parent"
     tools:context=".GestaltTestActivity">
 
-    <TextView
-        android:id="@+id/textDisplay"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+        <TextView
+                android:id="@+id/textDisplay"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:text="Hello World!"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+    </ScrollView>
 
 </android.support.constraint.ConstraintLayout>

gestalt-android/build.gradle

@@ -51,6 +51,7 @@ dependencies {
     }
     implementation project(':gestalt-util')
     implementation "org.slf4j:slf4j-api:$slf4j_version"
+    implementation "com.google.guava:guava:$guava_version"
 
     implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation "junit:junit:$junit_version"

gestalt-android/src/main/java/org/terasology/gestalt/android/AndroidModuleClassLoader.java

@@ -20,6 +20,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.terasology.context.FindResourcesClassLoader;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.sandbox.JavaModuleClassLoader;
 import org.terasology.gestalt.module.sandbox.ModuleClassLoader;
@@ -28,15 +29,17 @@
 import org.terasology.gestalt.naming.Name;
 
 import java.io.File;
+import java.net.URL;
 import java.security.AccessController;
+import java.util.Enumeration;
 import java.util.List;
 
 import dalvik.system.DexClassLoader;
 
 /**
  * A module class loader built on top of DexClassLoader, to support loading code under Android.
  */
-public class AndroidModuleClassLoader extends DexClassLoader implements ModuleClassLoader {
+public class AndroidModuleClassLoader extends DexClassLoader implements ModuleClassLoader, FindResourcesClassLoader {
 
     private static final Logger logger = LoggerFactory.getLogger(JavaModuleClassLoader.class);
     private static final Joiner FILE_JOINER = Joiner.on(File.pathSeparatorChar);
@@ -94,6 +97,11 @@ public PermissionProvider getPermissionProvider() {
         return permissionProvider;
     }
 
+    @Override
+    public Enumeration<URL> findResources(String name) {
+        return super.findResources(name);
+    }
+
     /**
      * @return The non-ModuleClassLoader that the module classloader chain is based on
      */

gestalt-asset-core/build.gradle

@@ -28,17 +28,33 @@ apply plugin: 'maven-publish'
 dependencies {
     implementation project(":gestalt-util")
     implementation project(":gestalt-module")
+    implementation project(":gestalt-inject")
+    annotationProcessor project(":gestalt-inject-java")
+
 
+    implementation "com.google.guava:guava:$guava_version"
     implementation "org.slf4j:slf4j-api:$slf4j_version"
     implementation "com.android.support:support-annotations:$android_annotation_version"
-    implementation "net.jcip:jcip-annotations:$jcip_annotation_version"
+    api "net.jcip:jcip-annotations:$jcip_annotation_version"
 
+    testAnnotationProcessor project(":gestalt-inject-java")
     testImplementation "junit:junit:$junit_version"
     testImplementation "ch.qos.logback:logback-classic:$logback_version"
     testImplementation "org.mockito:mockito-core:$mockito_version"
 
 }
 
+
+compileJava {
+    inputs.files sourceSets.main.resources.srcDirs
+    options.compilerArgs = ["-Aresource=${sourceSets.main.resources.srcDirs.join(File.pathSeparator)}"]
+}
+compileTestJava {
+    inputs.files sourceSets.test.resources.srcDirs
+    options.compilerArgs = ["-Aresource=${sourceSets.test.resources.srcDirs.join(File.pathSeparator)}"]
+}
+
+
 description = 'Provides support for assets - binary resources that can be loaded from modules or procedurally generated at runtime.'
 
 sourceCompatibility = 1.8
@@ -81,4 +97,4 @@ publishing {
             artifact javadocJar
         }
     }
-}
+}

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/AbstractFragmentDataProducer.java

@@ -22,8 +22,8 @@
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
 
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.assets.management.AssetManager;
-import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.io.IOException;

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/Asset.java

@@ -20,7 +20,7 @@
 
 import net.jcip.annotations.ThreadSafe;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.Optional;
 

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/AssetData.java

@@ -16,7 +16,7 @@
 
 package org.terasology.gestalt.assets;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * AssetData is the implementation agnostic data for an asset - typically it isn't dependant on either the source format

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/AssetDataProducer.java

@@ -16,7 +16,7 @@
 
 package org.terasology.gestalt.assets;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.io.IOException;

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/AssetFactory.java

@@ -16,7 +16,7 @@
 
 package org.terasology.gestalt.assets;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * AssetFactorys are used to load AssetData into new assets.

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/AssetType.java

@@ -34,7 +34,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.gestalt.util.reflection.GenericsUtil;
 

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/ResourceUrn.java

@@ -20,8 +20,8 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.assets.exceptions.InvalidUrnException;
-import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.util.regex.Matcher;

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/exceptions/package-info.java

@@ -20,4 +20,4 @@
 @API
 package org.terasology.gestalt.assets.exceptions;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/format/package-info.java

@@ -24,4 +24,4 @@
 @API
 package org.terasology.gestalt.assets.format;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/management/AssetManager.java

@@ -21,11 +21,11 @@
 
 import net.jcip.annotations.ThreadSafe;
 
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.assets.Asset;
 import org.terasology.gestalt.assets.AssetData;
 import org.terasology.gestalt.assets.AssetType;
 import org.terasology.gestalt.assets.ResourceUrn;
-import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.util.Collections;

gestalt-asset-core/src/main/java/org/terasology/gestalt/assets/management/MapAssetTypeManager.java

@@ -17,17 +17,13 @@
 package org.terasology.gestalt.assets.management;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.MapMaker;
 import com.google.common.collect.Multimaps;
-
 import net.jcip.annotations.ThreadSafe;
-
-import org.reflections.ReflectionUtils;
 import org.terasology.gestalt.assets.Asset;
 import org.terasology.gestalt.assets.AssetData;
 import org.terasology.gestalt.assets.AssetFactory;
@@ -52,6 +48,17 @@ public final class MapAssetTypeManager implements AssetTypeManager {
     private final ListMultimap<Class<? extends Asset>, Class<? extends Asset>> subtypes =
             Multimaps.synchronizedListMultimap(ArrayListMultimap.<Class<? extends Asset>, Class<? extends Asset>>create());
 
+    private static Iterable<Class<?>> getAllSuperClasses(Class<?> from, Class<?> to) {
+        Preconditions.checkArgument(to.isAssignableFrom(from), "%s should be subtype of %s", from, to);
+        List<Class<?>> subtypes = Lists.newArrayList();
+        Class<?> current = from;
+        while (current != to) {
+            subtypes.add(current);
+            current = current.getSuperclass();
+        }
+        return subtypes;
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public <T extends Asset<U>, U extends AssetData> Optional<AssetType<T, U>> getAssetType(Class<T> type) {
@@ -109,7 +116,7 @@ public synchronized void addAssetType(AssetType<?, ?> assetType) {
         Preconditions.checkState(assetTypes.get(assetType.getAssetClass()) == null, "Asset type already registered for - " + assetType.getAssetClass().getSimpleName());
 
         assetTypes.put(assetType.getAssetClass(), assetType);
-        for (Class<?> parentType : ReflectionUtils.getAllSuperTypes(assetType.getAssetClass(), (Predicate<Class<?>>) input -> Asset.class.isAssignableFrom(input) && input != Asset.class)) {
+        for (Class<?> parentType : getAllSuperClasses(assetType.getAssetClass(), Asset.class)) {
             subtypes.put((Class<? extends Asset>) parentType, assetType.getAssetClass());
             (subtypes.get((Class<? extends Asset>) parentType)).sort(Comparator.comparing(Class::getSimpleName));
 
@@ -128,7 +135,7 @@ public synchronized void addAssetType(AssetType<?, ?> assetType) {
         AssetType<?, ?> assetType = assetTypes.remove(type);
         if (assetType != null) {
             assetType.close();
-            for (Class<?> parentType : ReflectionUtils.getAllSuperTypes(type, (Predicate<Class<?>>) input -> Asset.class.isAssignableFrom(input) && input != Asset.class)) {
+            for (Class<?> parentType : getAllSuperClasses(type, Asset.class)) {
                 subtypes.remove(parentType, type);
             }
         }
@@ -145,6 +152,4 @@ public synchronized void clear() {
         assetTypes.clear();
         subtypes.clear();
     }
-
-
 }