Injection cleanup part 4

jboss-msc · Jul 28, 2010 · c844de8 · c844de8
1 parent bb776d1
commit c844de8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/org/jboss/msc/service/DelegatingInjectionSource.java b/src/main/java/org/jboss/msc/service/DelegatingInjectionSource.java
@@ -39,16 +39,14 @@ protected DelegatingInjectionSource(InjectionSource delegate) {
 
     @Override
     protected <T> Value<?> getValue(Value<T> serviceValue, ServiceContainerImpl container) {
-        return getValue(delegate.getValue(serviceValue, container), serviceValue, container);
+        return getValue(delegate.getValue(serviceValue, container));
     }
 
     /**
      * Contract method providing children with the value of the delegate InjectionSource.
      *
      * @param delegateValue The value from the delegate injection source
-     * @param serviceValue The service value
-     * @param container The service container
      * @return The value of the injection source
      */
-    protected abstract <T> Value<?> getValue(Value<?> delegateValue, Value<T> serviceValue, ServiceContainerImpl container);
+    protected abstract <T> Value<?> getValue(Value<?> delegateValue);
 }
diff --git a/src/main/java/org/jboss/msc/service/FieldDelegatingInjectionSource.java b/src/main/java/org/jboss/msc/service/FieldDelegatingInjectionSource.java
@@ -50,7 +50,7 @@ public FieldDelegatingInjectionSource(final InjectionSource delegate, final Stri
     }
 
     @Override
-    protected <T> Value<?> getValue(final Value<?> delegateValue, final Value<T> serviceValue, final ServiceContainerImpl container) {
+    protected <T> Value<?> getValue(final Value<?> delegateValue) {
         return new FieldValue(getFieldValue(delegateValue), delegateValue);
     }
 

diff --git a/src/main/java/org/jboss/msc/service/MethodDelegatingInjectionSource.java b/src/main/java/org/jboss/msc/service/MethodDelegatingInjectionSource.java
@@ -57,7 +57,7 @@ public MethodDelegatingInjectionSource(final InjectionSource delegate, final Val
     }
 
     @Override
-    protected <T> Value<?> getValue(final Value<?> delegateValue, final Value<T> serviceValue, final ServiceContainerImpl container) {
+    protected <T> Value<?> getValue(final Value<?> delegateValue) {
         return new MethodValue<T>(getMethodValue(delegateValue), delegateValue, parameters); 
     }
 

diff --git a/src/main/java/org/jboss/msc/service/PropertyDelegatingInjectionSource.java b/src/main/java/org/jboss/msc/service/PropertyDelegatingInjectionSource.java
@@ -50,7 +50,7 @@ public PropertyDelegatingInjectionSource(final InjectionSource delegate, final V
     }
 
     @Override
-    protected <T> Value<?> getValue(final Value<?> delegateValue, final Value<T> serviceValue, final ServiceContainerImpl container) {
+    protected <T> Value<?> getValue(final Value<?> delegateValue) {
         return new PropertyValue(getPropertyValue(delegateValue), delegateValue);
     }
 

diff --git a/src/main/java/org/jboss/msc/service/TranslatedInjectionDestination.java b/src/main/java/org/jboss/msc/service/TranslatedInjectionDestination.java
@@ -41,6 +41,7 @@ public TranslatedInjectionDestination(InjectionDestination delegate, Translator<
         this.translator = translator;
     }
 
+    @SuppressWarnings({ "unchecked" })
     @Override
     protected <T> Injector<?> getInjector(Value<T> injectionValue) {
         final Injector<O> delegateInjector = (Injector<O>) delegate.getInjector(injectionValue);