This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.models.impl-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit 3041e7990573cb418cb9e6286f0c45e67360497f Author: Justin Edelson <[email protected]> AuthorDate: Thu Aug 28 23:00:37 2014 +0000 SLING-3894 - removing duplicate type checks in Request and SlingBindings injectors git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/impl@1621224 13f79535-47bb-0310-9956-ffa450edef68 --- .../models/impl/injectors/BindingsInjector.java | 7 +----- .../impl/injectors/RequestAttributeInjector.java | 26 +--------------------- .../impl/injectors/BindingsInjectorTest.java | 7 ------ .../injectors/RequestAttributeInjectorTest.java | 7 ------ 4 files changed, 2 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java index e2140e2..d816162 100644 --- a/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java +++ b/src/main/java/org/apache/sling/models/impl/injectors/BindingsInjector.java @@ -48,12 +48,7 @@ public class BindingsInjector implements Injector, InjectAnnotationProcessorFact } private static Object getValue(SlingBindings bindings, String name, Class<?> type) { - Object value = bindings.get(name); - if (type.isInstance(value)) { - return value; - } else { - return null; - } + return bindings.get(name); } public Object getValue(Object adaptable, String name, Type type, AnnotatedElement element, diff --git a/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java index 081bcbf..685e587 100644 --- a/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java +++ b/src/main/java/org/apache/sling/models/impl/injectors/RequestAttributeInjector.java @@ -17,7 +17,6 @@ package org.apache.sling.models.impl.injectors; import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import javax.servlet.ServletRequest; @@ -53,30 +52,7 @@ public class RequestAttributeInjector implements Injector, InjectAnnotationProce if (!(adaptable instanceof ServletRequest)) { return null; } else { - Object attribute = ((ServletRequest) adaptable).getAttribute(name); - if (attribute != null) { - if (declaredType instanceof Class<?>) { - Class<?> clazz = (Class<?>) declaredType; - if (clazz.isInstance(attribute)) { - return attribute; - } else { - return null; - } - } else if (declaredType instanceof ParameterizedType) { - ParameterizedType parameterizedType = (ParameterizedType) declaredType; - Type rawType = parameterizedType.getRawType(); - if (rawType instanceof Class<?>) { - Class<?> clazz = (Class<?>) rawType; - if (clazz.isInstance(attribute)) { - return attribute; - } else { - return null; - } - } - } - log.debug("RequestAttributeInjector doesn't support type {}, type class {}.", declaredType, declaredType.getClass()); - } - return null; + return ((ServletRequest) adaptable).getAttribute(name); } } diff --git a/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java b/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java index fa15446..6d0cc66 100644 --- a/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java +++ b/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.*; import javax.servlet.ServletRequest; -import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.scripting.SlingBindings; import org.junit.Before; @@ -77,12 +76,6 @@ public class BindingsInjectorTest { } @Test - public void testNonMatchingClassInstance() { - Object result = injector.getValue(request, CLASS_PARAM, Resource.class, null, null); - assertNull(result); - } - - @Test public void testNonRequestAdaptable() { Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, null, null); assertNull(result); diff --git a/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java b/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java index 75ac1ca..3176243 100644 --- a/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java +++ b/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.*; import javax.servlet.ServletRequest; -import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.junit.Before; import org.junit.Test; @@ -73,12 +72,6 @@ public class RequestAttributeInjectorTest { } @Test - public void testNonMatchingClassInstance() { - Object result = injector.getValue(request, CLASS_PARAM, Resource.class, null, null); - assertNull(result); - } - - @Test public void testNonRequestAdaptable() { Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, null, null); assertNull(result); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
