(wicket) branch wicket-9.x updated: WICKET-7086: Fix the build for wicket-9.x

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-9.x by this push:
     new 694c95ca60 WICKET-7086: Fix the build for wicket-9.x
694c95ca60 is described below

commit 694c95ca60c4a0ca3b7bbfd5af9df4190238ec34
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Mon Dec 4 11:13:21 2023 +0200

    WICKET-7086: Fix the build for wicket-9.x
    
    Replace jakarta.* with javax.*
    Implement ApplicationContextMock#getBeanNamesForType(ResolvableType, ...) 
methods
    
    Signed-off-by: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
---
 .../apache/wicket/spring/test/ApplicationContextMock.java | 15 +++++++++++++--
 .../injection/annot/SpringBeanWithGenericsTest.java       |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git 
a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
 
b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
index 7b92e5efdd..18992c28d3 100644
--- 
a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
+++ 
b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
@@ -22,6 +22,7 @@ import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -291,13 +292,23 @@ public class ApplicationContextMock implements 
ApplicationContext, Serializable
        @Override
        public String[] getBeanNamesForType(ResolvableType resolvableType)
        {
-               return new String[0];
+               return getBeanNamesForType(resolvableType, true, true);
        }
 
        @Override
        public String[] getBeanNamesForType(ResolvableType resolvableType, 
boolean includeNonSingletons, boolean allowEagerInit)
        {
-               return new String[0];
+               List<String> names = new ArrayList<>();
+               for (Entry<String, Object> entry : beans.entrySet())
+               {
+                       Object bean = entry.getValue();
+
+                       if (resolvableType.isAssignableFrom(bean.getClass()))
+                       {
+                               names.add(entry.getKey());
+                       }
+               }
+               return names.toArray(new String[0]);
        }
 
        @Override
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 8ba175bebc..7b2765bd0a 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,7 +16,7 @@
  */
 package org.apache.wicket.spring.injection.annot;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.spring.BeanWithGeneric;
 import org.apache.wicket.util.tester.DummyHomePage;