build: Added configurations to apply constraints to dependencies resolves #134

gestalt-android-testbed/build.gradle

@@ -50,6 +50,20 @@ dependencies {
 
     annotationProcessor(project(":gestalt-inject-java"))
 }
+configurations {
+    // Apply constraints to enforce specific versions
+    all {
+        resolutionStrategy {
+            force(
+                "com.android.support:appcompat-v7:28.0.0",
+                "com.android.support.constraint:constraint-layout:1.1.3",
+                "com.github.tony19:logback-android:1.3.0-3",
+                "com.android.support.test:runner:1.0.2",
+                "com.android.support.test.espresso:espresso-core:3.0.2"
+            )
+        }
+    }
+}
 
 // Android projects don't provide direct access to compileJava but this seems to work.
 // https://stackoverflow.com/a/42297051

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

@@ -31,6 +31,8 @@
 import java.util.Optional;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 /**
  * An abstract implementation of AssetDataProducer aimed to ease the creation of producers that provide fragments from other assets.
  * <p>
@@ -71,7 +73,7 @@ public Set<Name> getModulesProviding(Name resourceName) {
             return ImmutableSet.copyOf(Collections2.transform(assetManager.resolve(resourceName.toString(), rootAssetType), new Function<ResourceUrn, Name>() {
                 @Nullable
                 @Override
-                public Name apply(ResourceUrn input) {
+                public Name apply(@Nonnull ResourceUrn input) {
                     return input.getModuleName();
                 }
             }));

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

@@ -171,8 +171,8 @@ public boolean equals(Object obj) {
         if (obj == this) {
             return true;
         }
-        if (obj instanceof Asset) {
-            Asset other = (Asset) obj;
+        if (obj instanceof Asset<?>) {
+            Asset<?> other = (Asset<?>) obj;
             return !urn.isInstance() && !other.urn.isInstance() && other.urn.equals(urn);
         }
         return false;

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

@@ -16,6 +16,7 @@
 
 package org.terasology.gestalt.assets;
 
+
 import android.support.annotation.Nullable;
 
 import com.google.common.base.Function;
@@ -45,16 +46,17 @@
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Type;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
+
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Semaphore;
 
+import javax.annotation.Nonnull;
+
 /**
  * AssetType manages all assets of a particular type/class.  It provides the ability to resolve and load assets by Urn, and caches assets so that there is only
  * a single instance of a given asset shared by all users.
@@ -131,7 +133,7 @@ public synchronized void close() {
     /**
      * Disposes any assets queued for disposal. This occurs if an asset is no longer referenced by anything.
      */
-    @SuppressWarnings("unchecked")
+    //@SuppressWarnings("unchecked")
     public void processDisposal() {
         Reference<? extends Asset<U>> ref = disposalQueue.poll();
         while (ref != null) {
@@ -298,7 +300,7 @@ synchronized void registerAsset(Asset<U> asset, DisposalHook disposer) {
     }
 
     /**
-     * Creates and returns an instance of an asset, if possible. The following methods are used to create the copy, in order, with the first technique to succeeed used:
+     * Creates and returns an instance of an asset, if possible. The following methods are used to create the copy, in order, with the first technique to succeed used:
      * <ol>
      * <li>Delegate to the parent asset to create the copy</li>
      * <li>Loads the AssetData of the parent asset and create a new instance from that</li>
@@ -307,7 +309,7 @@ synchronized void registerAsset(Asset<U> asset, DisposalHook disposer) {
      * @param urn The urn of the asset to create an instance of
      * @return An instance of the desired asset
      */
-    @SuppressWarnings("unchecked")
+   // @SuppressWarnings("unchecked")
     public Optional<T> getInstanceAsset(ResourceUrn urn) {
         Optional<? extends T> parentAsset = getAsset(urn.getParentUrn());
         if (parentAsset.isPresent()) {
@@ -328,16 +330,16 @@ Optional<T> createInstance(Asset<U> asset) {
         Optional<? extends Asset<U>> result = asset.createCopy(asset.getUrn().getInstanceUrn());
         if (!result.isPresent()) {
             try {
-                return AccessController.doPrivileged((PrivilegedExceptionAction<Optional<T>>) () -> {
+
                     for (AssetDataProducer<U> producer : producers) {
                         Optional<U> data = producer.getAssetData(asset.getUrn());
                         if (data.isPresent()) {
                             return Optional.of(loadAsset(asset.getUrn().getInstanceUrn(), data.get()));
                         }
                     }
                     return Optional.ofNullable(assetClass.cast(result.get()));
-                });
-            } catch (PrivilegedActionException e) {
+
+            } catch (Exception e) {
                 logger.error("Failed to load asset '" + asset.getUrn().getInstanceUrn() + "'", e.getCause());
             }
         }
@@ -355,16 +357,16 @@ public Optional<T> reload(ResourceUrn urn) {
         Preconditions.checkArgument(!urn.isInstance(), "Cannot reload an asset instance urn");
         ResourceUrn redirectUrn = followRedirects(urn);
         try {
-            return AccessController.doPrivileged((PrivilegedExceptionAction<Optional<T>>) () -> {
+             
                 for (AssetDataProducer<U> producer : producers) {
                     Optional<U> data = producer.getAssetData(redirectUrn);
                     if (data.isPresent()) {
                         return Optional.of(loadAsset(redirectUrn, data.get()));
                     }
                 }
                 return Optional.ofNullable(loadedAssets.get(redirectUrn));
-            });
-        } catch (PrivilegedActionException e) {
+
+        } catch (Exception e) {
             if (redirectUrn.equals(urn)) {
                 logger.error("Failed to load asset '{}'", redirectUrn, e.getCause());
             } else {
@@ -484,7 +486,7 @@ public Set<ResourceUrn> resolve(String urn, Name moduleContext) {
         return Sets.newLinkedHashSet(Collections2.transform(possibleModules, new Function<Name, ResourceUrn>() {
             @Nullable
             @Override
-            public ResourceUrn apply(Name input) {
+            public ResourceUrn apply(@Nonnull Name input) {
                 return new ResourceUrn(input, resourceName, fragmentName, instance);
             }
         }));
@@ -601,7 +603,7 @@ public boolean equals(Object obj) {
             return true;
         }
         if (obj instanceof AssetType) {
-            AssetType other = (AssetType) obj;
+            AssetType<?, ?> other = (AssetType<?, ?>) obj;
             return assetClass.equals(other.assetClass);
         }
         return false;

gestalt-inject-java/src/main/java/org/terasology/gestalt/annotation/processing/AnnotationTypeWriter.java

@@ -6,7 +6,6 @@
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,7 +16,7 @@ public class AnnotationTypeWriter {
 
     private final Filer filer;
     private final Map<String, HashSet<String>> results = new HashMap<>();
-    private final Map<String, FileObject> files = new HashMap<>();
+
 
     public AnnotationTypeWriter(Filer filer) {
         this.filer = filer;

gestalt-inject-java/src/main/java/org/terasology/gestalt/annotation/processing/ServiceTypeWriter.java

@@ -6,7 +6,6 @@
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,8 +16,7 @@ public class ServiceTypeWriter {
 
     private final Filer filer;
     private final Map<String, HashSet<String>> results = new HashMap<>();
-    private final Map<String, FileObject> files = new HashMap<>();
-
+
     public ServiceTypeWriter(Filer filer) {
         this.filer = filer;
     }

gestalt-inject-java/src/main/java/org/terasology/gestalt/annotation/processing/SubtypesTypeWriter.java

@@ -6,7 +6,6 @@
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,7 +16,7 @@ public class SubtypesTypeWriter {
 
     private final Filer filer;
     private final Map<String, HashSet<String>> results = new HashMap<>();
-    private final Map<String, FileObject> files = new HashMap<>();
+
 
     public SubtypesTypeWriter(Filer filer) {
         this.filer = filer;