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/02/22 07:35:41 UTC
[wicket] branch wicket-9.x updated: WICKET-7005: ByteBuddy IllegalStateException: Cannot inject already loaded type
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 ad4d6313ad WICKET-7005: ByteBuddy IllegalStateException: Cannot inject already loaded type
ad4d6313ad is described below
commit ad4d6313ad60bd32ba068a25557a0c280e43b085
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Wed Feb 22 09:27:25 2023 +0200
WICKET-7005: ByteBuddy IllegalStateException: Cannot inject already loaded type
Configure ByteBuddy to not fail on already loaded classes
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
pom.xml | 6 +
.../proxy/bytebuddy/ByteBuddyProxyFactory.java | 2 +-
wicket-spring/pom.xml | 4 +
.../injection/bytebuddy/ParallelInjectionTest.java | 175 +++++++++++++++++++++
4 files changed, 186 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ca2ad83798..e5f8db0774 100644
--- a/pom.xml
+++ b/pom.xml
@@ -675,6 +675,12 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/proxy/bytebuddy/ByteBuddyProxyFactory.java b/wicket-ioc/src/main/java/org/apache/wicket/proxy/bytebuddy/ByteBuddyProxyFactory.java
index 9cc5cf419b..307786d9d4 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/proxy/bytebuddy/ByteBuddyProxyFactory.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/proxy/bytebuddy/ByteBuddyProxyFactory.java
@@ -116,7 +116,7 @@ public class ByteBuddyProxyFactory implements IProxyFactory
.implement(InterceptorMutator.class).intercept(FieldAccessor.ofBeanProperty())
.implement(Serializable.class, IWriteReplace.class, ILazyInitProxy.class).intercept(MethodDelegation.toField(INTERCEPTOR_FIELD_NAME))
.make()
- .load(classLoader, ClassLoadingStrategy.Default.INJECTION)
+ .load(classLoader, ClassLoadingStrategy.Default.INJECTION.allowExistingTypes())
.getLoaded());
}
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index 5f226c33f8..cad6427241 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -53,5 +53,9 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/bytebuddy/ParallelInjectionTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/bytebuddy/ParallelInjectionTest.java
new file mode 100644
index 0000000000..01ea047937
--- /dev/null
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/bytebuddy/ParallelInjectionTest.java
@@ -0,0 +1,175 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.spring.injection.bytebuddy;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.ThreadContext;
+import org.apache.wicket.injection.Injector;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
+import org.apache.wicket.util.tester.DummyHomePage;
+import org.apache.wicket.util.tester.WicketTester;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.web.context.WebApplicationContext;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.ServletContext;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/* WICKET-7005 */
+@WebAppConfiguration
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = { ParallelInjectionTest.ServiceConfig.class })
+public class ParallelInjectionTest implements ApplicationContextAware {
+
+ @ComponentScan(basePackages = "org.apache.wicket.spring.injection.bytebuddy")
+ @Configuration
+ public static class ServiceConfig {
+ }
+
+ @Named
+ public static class ServiceA {
+ @Inject
+ private ServiceC serviceC;
+ @Inject
+ private ServiceD serviceD;
+ }
+
+ @Named
+ public static class ServiceB {
+ }
+
+ @Named
+ public static class ServiceC {
+ }
+
+ @Named
+ public static class ServiceD {
+ }
+
+ public static class DemoComponent {
+
+ @Inject
+ private ServiceB serviceB;
+ @Inject
+ private ServiceA serviceA;
+
+ public DemoComponent() {
+ }
+ }
+
+ private static final Logger LOG = LoggerFactory.getLogger(ParallelInjectionTest.class);
+
+ private ApplicationContext context;
+
+ @BeforeAll
+ static void beforeAll() {
+ System.setProperty("wicket.ioc.useByteBuddy", Boolean.TRUE.toString());
+ }
+
+ @Test
+ void parallel() throws Exception {
+ runInjection(10);
+ }
+
+ @Test
+ void notParallel() throws Exception {
+ runInjection(1);
+ }
+
+ void runInjection(int nThreads) throws InterruptedException {
+ // Arrange
+ var tester = new WicketTester(createPortalApplication());
+ ExecutorService executor = Executors.newFixedThreadPool(nThreads);
+
+ Callable<String> callableTask = () -> {
+ LOG.debug("Thread id: {}", Thread.currentThread().getId());
+ ThreadContext.setApplication(tester.getApplication());
+ var panel = new DemoComponent();
+ Injector.get().inject(panel);
+ return "Injected";
+ };
+
+ // Act
+ var tasks = IntStream.rangeClosed(1, 100)
+ .mapToObj(i -> callableTask)
+ .collect(Collectors.toList());
+
+ var futures = executor.invokeAll(tasks);
+
+ futures.forEach(f -> {
+ try {
+ LOG.debug("Returned {}", f.get());
+ } catch (Exception e) {
+ throw new RuntimeException("A problem occurred", e);
+ }
+ });
+ }
+
+ private WebApplication createPortalApplication() {
+ LOG.debug("Erstelle MockServletContext mit applicationContext");
+
+ MockServletContext mockServletContext = new MockServletContext();
+
+ mockServletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, context);
+
+ LOG.debug("Erstelle PortalApplication ...");
+
+ return new WebApplication() {
+ @Override
+ public ServletContext getServletContext() {
+ return mockServletContext;
+ }
+
+ @Override
+ public Class<? extends Page> getHomePage() {
+ return DummyHomePage.class;
+ }
+
+ @Override
+ protected void init() {
+ super.init();
+
+ getComponentInstantiationListeners().add(new SpringComponentInjector(this));
+ getCspSettings().blocking().disabled();
+ }
+ };
+ }
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ this.context = applicationContext;
+ }
+}