From 39684339724ce966332deb846061d12701db99f2 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 6 May 2014 20:39:47 -0400 Subject: core: Make TypeLiterals use JSR-330 Providers. --- .../src/main/java/com/tavianator/sangria/core/TypeLiterals.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'sangria-core/src/main/java') 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 TypeLiteral> providerOf(Class type) { - return (TypeLiteral>)TypeLiteral.get(Types.providerOf(type)); + // Can't use Types.providerOf() because we want to stick to JSR-330 Providers + return (TypeLiteral>)TypeLiteral.get(Types.newParameterizedType(Provider.class, type)); } @SuppressWarnings("unchecked") public static TypeLiteral> providerOf(TypeLiteral type) { - return (TypeLiteral>)TypeLiteral.get(Types.providerOf(type.getType())); + // Can't use Types.providerOf() because we want to stick to JSR-330 Providers + return (TypeLiteral>)TypeLiteral.get(Types.newParameterizedType(Provider.class, type.getType())); } } -- cgit v1.2.3