diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java index 205132dc6c..0b737259b9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -267,7 +267,7 @@ public abstract class IntegrationObjectSupport implements BeanNameAware, NamedCo return this.conversionService; } - protected void setConversionService(ConversionService conversionService) { + public void setConversionService(ConversionService conversionService) { this.conversionService = conversionService; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTests.java similarity index 93% rename from spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java rename to spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTests.java index d8f867b5db..653d1f2722 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; @@ -40,11 +40,12 @@ import static org.mockito.Mockito.mock; /** * @author Gary Russell + * @author Artem Bilan * * @since 3.0 * */ -public class RouterConcurrencyTest { +public class RouterConcurrencyTests { @Test public void test() throws Exception { @@ -57,7 +58,7 @@ public class RouterConcurrencyTest { } @Override - protected void setConversionService(ConversionService conversionService) { + public void setConversionService(ConversionService conversionService) { try { if (count.incrementAndGet() > 1) { Thread.sleep(20);