core: Make TypeLiterals use JSR-330 Providers.

2 files changed, 8 insertions, 4 deletions

diff --git a/sangria-core/src/main/java/com/tavianator/sangria/core/TypeLiterals.java b/sangria-core/src/main/java/com/tavianator/sangria/core/TypeLiterals.java
index 833f70d..ff42790 100644
--- a/sangria-core/src/main/java/com/tavianator/sangria/core/TypeLiterals.java
+++ b/sangria-core/src/main/java/com/tavianator/sangria/core/TypeLiterals.java
@@ -19,7 +19,8 @@ package com.tavianator.sangria.core;
 
 import java.util.*;
 
-import com.google.inject.Provider;
+import javax.inject.Provider;
+
 import com.google.inject.TypeLiteral;
 import com.google.inject.util.Types;
 
@@ -77,11 +78,13 @@ public class TypeLiterals {
 
     @SuppressWarnings("unchecked")
     public static <T> TypeLiteral<Provider<T>> providerOf(Class<T> type) {
-        return (TypeLiteral<Provider<T>>)TypeLiteral.get(Types.providerOf(type));
+        // Can't use Types.providerOf() because we want to stick to JSR-330 Providers
+        return (TypeLiteral<Provider<T>>)TypeLiteral.get(Types.newParameterizedType(Provider.class, type));
     }
 
     @SuppressWarnings("unchecked")
     public static <T> TypeLiteral<Provider<T>> providerOf(TypeLiteral<T> type) {
-        return (TypeLiteral<Provider<T>>)TypeLiteral.get(Types.providerOf(type.getType()));
+        // Can't use Types.providerOf() because we want to stick to JSR-330 Providers
+        return (TypeLiteral<Provider<T>>)TypeLiteral.get(Types.newParameterizedType(Provider.class, type.getType()));
     }
 }
diff --git a/sangria-core/src/test/java/com/tavianator/sangria/core/TypeLiteralsTest.java b/sangria-core/src/test/java/com/tavianator/sangria/core/TypeLiteralsTest.java
index 93dea77..3e7cdb8 100644
--- a/sangria-core/src/test/java/com/tavianator/sangria/core/TypeLiteralsTest.java
+++ b/sangria-core/src/test/java/com/tavianator/sangria/core/TypeLiteralsTest.java
@@ -19,7 +19,8 @@ package com.tavianator.sangria.core;
 
 import java.util.*;
 
-import com.google.inject.Provider;
+import javax.inject.Provider;
+
 import com.google.inject.TypeLiteral;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;