svn commit: r1572635 - in /onami/trunk: lifecycle/core/src/main/java/org/apache/onami/lifecycle/core/LifeCycleStageModule.java test/src/main/java/org/apache/onami/test/handler/GuiceProvidedModuleHandler.java

[ash2k]

Author: ash2k
Date: Thu Feb 27 15:49:20 2014
New Revision: 1572635

URL: http://svn.apache.org/r1572635
Log:
Do not use Guice internal APIs

Modified:
    
onami/trunk/lifecycle/core/src/main/java/org/apache/onami/lifecycle/core/LifeCycleStageModule.java
    
onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceProvidedModuleHandler.java

Modified: 
onami/trunk/lifecycle/core/src/main/java/org/apache/onami/lifecycle/core/LifeCycleStageModule.java
URL: 
http://svn.apache.org/viewvc/onami/trunk/lifecycle/core/src/main/java/org/apache/onami/lifecycle/core/LifeCycleStageModule.java?rev=1572635&r1=1572634&r2=1572635&view=diff
==============================================================================
--- 
onami/trunk/lifecycle/core/src/main/java/org/apache/onami/lifecycle/core/LifeCycleStageModule.java
 (original)
+++ 
onami/trunk/lifecycle/core/src/main/java/org/apache/onami/lifecycle/core/LifeCycleStageModule.java
 Thu Feb 27 15:49:20 2014
@@ -21,13 +21,14 @@ package org.apache.onami.lifecycle.core;
 
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.MoreTypes;
 import com.google.inject.matcher.Matcher;
 import com.google.inject.spi.InjectionListener;
 import com.google.inject.spi.TypeEncounter;
+import com.google.inject.util.Types;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
 
 import static com.google.inject.matcher.Matchers.any;
 
@@ -110,8 +111,7 @@ public final class LifeCycleStageModule<
 
     private static <A extends Annotation> TypeLiteral<Stager<A>> type( 
Class<A> stage )
     {
-        MoreTypes.ParameterizedTypeImpl parameterizedType =
-            new MoreTypes.ParameterizedTypeImpl( null, Stager.class, stage );
+        ParameterizedType parameterizedType = 
Types.newParameterizedTypeWithOwner( null, Stager.class, stage );
         //noinspection unchecked
         @SuppressWarnings( "unchecked" ) // TODO
         TypeLiteral<Stager<A>> stagerType = (TypeLiteral<Stager<A>>) 
TypeLiteral.get( parameterizedType );

Modified: 
onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceProvidedModuleHandler.java
URL: 
http://svn.apache.org/viewvc/onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceProvidedModuleHandler.java?rev=1572635&r1=1572634&r2=1572635&view=diff
==============================================================================
--- 
onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceProvidedModuleHandler.java
 (original)
+++ 
onami/trunk/test/src/main/java/org/apache/onami/test/handler/GuiceProvidedModuleHandler.java
 Thu Feb 27 15:49:20 2014
@@ -34,7 +34,6 @@ import org.apache.onami.test.reflection.
 
 import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.MoreTypes;
 
 /**
  * Handler class to handle all {@link GuiceProvidedModules} annotations.
@@ -90,15 +89,15 @@ public final class GuiceProvidedModuleHa
             {
                 modules.add( (Module) method.invoke( type ) );
             }
-            else if ( MoreTypes.getRawType( new TypeLiteral<Iterable<Module>>()
+            else if ( new TypeLiteral<Iterable<Module>>()
             {
-            }.getType() ).isAssignableFrom( returnType ) )
+            }.getRawType().isAssignableFrom( returnType ) )
             {
                 addModules( (Iterable<Module>) method.invoke( type ) );
             }
-            else if ( MoreTypes.getRawType( new TypeLiteral<Module[]>()
+            else if ( new TypeLiteral<Module[]>()
             {
-            }.getType() ).isAssignableFrom( returnType ) )
+            }.getRawType().isAssignableFrom( returnType ) )
             {
                 addModules( (Module[]) method.invoke( type ) );
             }