You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2023/11/22 12:35:07 UTC
(wicket) branch wicket-7086-better-support-for-manual-injection-with-generics created (now f899d4e137)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch wicket-7086-better-support-for-manual-injection-with-generics
in repository https://gitbox.apache.org/repos/asf/wicket.git
at f899d4e137 WICKET-7086: Injecting Spring bean may cause ClassCastException
This branch includes the following new commits:
new f899d4e137 WICKET-7086: Injecting Spring bean may cause ClassCastException
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(wicket) 01/01: WICKET-7086: Injecting Spring bean may cause ClassCastException
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-7086-better-support-for-manual-injection-with-generics
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit f899d4e13707f65ec00ae8e2fe590251093b0eed
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Wed Nov 22 14:34:33 2023 +0200
WICKET-7086: Injecting Spring bean may cause ClassCastException
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
.../annot/AnnotProxyFieldValueFactory.java | 23 +++++--------
.../annot/SpringBeanWithGenericsTest.java | 40 ++++++++++++++++++----
2 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
index 14d6f938bb..692857f86c 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
@@ -82,7 +82,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
private final ConcurrentMap<SpringBeanLocator, Object> cache = Generics.newConcurrentHashMap();
- private final ConcurrentMap<SimpleEntry<Class<?>, Class<?>>,
+ private final ConcurrentMap<SimpleEntry<Class<?>, ResolvableType>,
String> beanNameCache = Generics.newConcurrentHashMap();
private final boolean wrapInProxies;
@@ -131,8 +131,8 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
required = true;
}
- Class<?> generic = ResolvableType.forField(field).resolveGeneric(0);
- String beanName = getBeanName(field, name, required, generic);
+ ResolvableType resolvableType = ResolvableType.forField(field);
+ String beanName = getBeanName(field, name, required, resolvableType);
SpringBeanLocator locator = new SpringBeanLocator(beanName, field.getType(), field, contextLocator);
@@ -185,17 +185,17 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
* @param field
* @return bean name
*/
- private String getBeanName(final Field field, String name, boolean required, Class<?> generic)
+ private String getBeanName(final Field field, String name, boolean required, ResolvableType resolvableType)
{
if (Strings.isEmpty(name))
{
Class<?> fieldType = field.getType();
- SimpleEntry<Class<?>, Class<?>> key = new SimpleEntry<Class<?>, Class<?>>(fieldType, generic);
+ SimpleEntry<Class<?>, ResolvableType> key = new SimpleEntry<>(fieldType, resolvableType);
name = beanNameCache.get(key);
if (name == null)
{
- name = getBeanNameOfClass(contextLocator.getSpringContext(), fieldType, generic, field.getName());
+ name = getBeanNameOfClass(contextLocator.getSpringContext(), fieldType, resolvableType, field.getName());
if (name != null)
{
String tmpName = beanNameCache.putIfAbsent(key, name);
@@ -223,11 +223,11 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
* @return spring name of the bean
*/
private String getBeanNameOfClass(final ApplicationContext ctx, final Class<?> clazz,
- final Class<?> generic, String fieldName)
+ final ResolvableType resolvableType, String fieldName)
{
// get the list of all possible matching beans
List<String> names = new ArrayList<>(
- Arrays.asList(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(ctx, clazz)));
+ Arrays.asList(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(ctx, resolvableType)));
// filter out beans that are not candidates for autowiring
if (ctx instanceof AbstractApplicationContext)
@@ -277,12 +277,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
{
return names.get(nameIndex);
}
-
- if (generic != null)
- {
- return null;
- }
-
+
StringBuilder msg = new StringBuilder();
msg.append("More than one bean of type [");
msg.append(clazz.getName());
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
index ac743c143c..1e022df0ec 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.spring.injection.annot;
+import jakarta.inject.Inject;
+import org.apache.wicket.injection.Injector;
import org.apache.wicket.spring.BeanWithGeneric;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTester;
@@ -26,7 +28,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -148,7 +149,7 @@ class SpringBeanWithGenericsTest
assertEquals("two", arrayListStrings.get(1));
assertEquals("three", arrayListStrings.get(2));
- ArrayList<Integer> arrayListIntegers = page.getArrayListIntegers();
+ List<Integer> arrayListIntegers = page.getArrayListIntegers();
assertNotNull(arrayListIntegers);
assertEquals(3, arrayListIntegers.size());
assertEquals(Integer.valueOf(1), arrayListIntegers.get(0));
@@ -237,7 +238,7 @@ class SpringBeanWithGenericsTest
}
}
- class AnnotatedListField extends DummyHomePage
+ static class AnnotatedListField extends DummyHomePage
{
@SpringBean
private List<String> stringsList;
@@ -256,9 +257,9 @@ class SpringBeanWithGenericsTest
}
@SpringBean
- private ArrayList<Integer> arrayListIntegers;
+ private List<Integer> arrayListIntegers;
- public ArrayList<Integer> getArrayListIntegers()
+ public List<Integer> getArrayListIntegers()
{
return arrayListIntegers;
}
@@ -304,7 +305,7 @@ class SpringBeanWithGenericsTest
}
@Bean
- public ArrayList<Integer> arrayListIntegers()
+ public List<Integer> arrayListIntegers()
{
ArrayList<Integer> arrayList = new ArrayList<>();
arrayList.add(1);
@@ -319,6 +320,33 @@ class SpringBeanWithGenericsTest
myList.add("one");
return myList;
}
+
+ @Bean
+ public List<Boolean> booleans() {
+ return List.of(true, false);
+ }
+ }
+
+ private static class Wicket7086 {
+ @Inject
+ private List<Boolean> injected;
+ }
+
+ /**
+ * <a href="https://issues.apache.org/jira/browse/WICKET-7086">WICKET-7086</a>
+ */
+ @Test
+ void manualInjectionOfTypeWithGenerics() {
+ tester.startPage(new AnnotatedListField());
+
+ // Created by hand, not by Spring, fields are not injected.
+ Wicket7086 wicketInjected = new Wicket7086();
+
+ // Manual injection.
+ Injector.get().inject(wicketInjected);
+
+ Boolean item = wicketInjected.injected.get(0);
+ assertTrue(item);
}
public static class MyList<T> extends ArrayList<T> {}