Fix Syslog module for changes in IP module

* Remove `SyslogdTests.java` which are not tests.

Author: artembilan

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SyslogdTests-context.xml

@@ -18,6 +18,7 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.context.ApplicationEventPublisher;
@@ -184,28 +185,38 @@ public Class<?> getObjectType() {
 	@Override
 	protected SyslogReceivingChannelAdapterSupport createInstance() {
 		SyslogReceivingChannelAdapterSupport adapter;
+		UnicastReceivingChannelAdapter udpAdapterToUse = this.udpAdapter;
+		BeanFactory beanFactory = getBeanFactory();
+		ApplicationEventPublisher applicationEventPublisherToUse = this.applicationEventPublisher;
 		if (this.protocol == Protocol.tcp) {
 			adapter = new TcpSyslogReceivingChannelAdapter();
 			if (this.connectionFactory != null) {
 				Assert.isNull(this.port, "Cannot specify both 'port' and 'connectionFactory'");
 				((TcpSyslogReceivingChannelAdapter) adapter).setConnectionFactory(this.connectionFactory);
 			}
-			else if (this.applicationEventPublisher != null) {
+			else if (applicationEventPublisherToUse != null) {
 				((TcpSyslogReceivingChannelAdapter) adapter)
-						.setApplicationEventPublisher(this.applicationEventPublisher);
+						.setApplicationEventPublisher(applicationEventPublisherToUse);
 			}
-			Assert.isNull(this.udpAdapter, "Cannot specify 'udp-attributes' when the protocol is 'tcp'");
+			Assert.isNull(udpAdapterToUse, "Cannot specify 'udp-attributes' when the protocol is 'tcp'");
 		}
 		else if (this.protocol == Protocol.udp) {
 			adapter = new UdpSyslogReceivingChannelAdapter();
-			if (this.udpAdapter != null) {
+			if (udpAdapterToUse != null) {
 				Assert.isNull(this.port, "Cannot specify both 'port' and 'udpAdapter'");
-				((UdpSyslogReceivingChannelAdapter) adapter).setUdpAdapter(this.udpAdapter);
+				if (beanFactory != null) {
+					udpAdapterToUse.setBeanFactory(beanFactory);
+				}
+				if (applicationEventPublisherToUse != null) {
+					udpAdapterToUse.setApplicationEventPublisher(applicationEventPublisherToUse);
+				}
+				udpAdapterToUse.afterPropertiesSet();
+				((UdpSyslogReceivingChannelAdapter) adapter).setUdpAdapter(udpAdapterToUse);
 			}
 			Assert.isNull(this.connectionFactory, "Cannot specify 'connection-factory' unless the protocol is 'tcp'");
 		}
 		else {
-			throw new IllegalStateException("Unsupported protocol: " + this.protocol.toString());
+			throw new IllegalStateException("Unsupported protocol: " + this.protocol);
 		}
 
 		adapter.setAutoStartup(this.autoStartup);
@@ -218,7 +229,8 @@ else if (this.protocol == Protocol.udp) {
 				.acceptIfNotNull(this.sendTimeout, adapter::setSendTimeout)
 				.acceptIfNotNull(this.converter, adapter::setConverter)
 				.acceptIfNotNull(this.beanName, adapter::setBeanName)
-				.acceptIfNotNull(getBeanFactory(), adapter::setBeanFactory);
+				.acceptIfNotNull(beanFactory, adapter::setBeanFactory)
+				.acceptIfNotNull(applicationEventPublisherToUse, adapter::setApplicationEventPublisher);
 
 		adapter.afterPropertiesSet();
 		this.syslogAdapter = adapter;

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SyslogdTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.syslog.inbound;
 
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.integration.endpoint.MessageProducerSupport;
 import org.springframework.integration.syslog.DefaultMessageConverter;
 import org.springframework.integration.syslog.MessageConverter;
@@ -28,19 +30,34 @@
  *
  * @author Gary Russell
  * @author Ngoc Nhan
+ * @author Artem Bilan
+ *
  * @since 3.0
  *
  */
-public abstract class SyslogReceivingChannelAdapterSupport extends MessageProducerSupport {
+public abstract class SyslogReceivingChannelAdapterSupport extends MessageProducerSupport
+		implements ApplicationEventPublisherAware {
 
 	protected static final int DEFAULT_PORT = 514;
 
+	@SuppressWarnings("NullAway.Init")
+	private ApplicationEventPublisher applicationEventPublisher;
+
 	private volatile int port = DEFAULT_PORT;
 
 	private MessageConverter converter = new DefaultMessageConverter();
 
 	private boolean converterSet;
 
+	@Override
+	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+		this.applicationEventPublisher = applicationEventPublisher;
+	}
+
+	protected ApplicationEventPublisher getApplicationEventPublisher() {
+		return this.applicationEventPublisher;
+	}
+
 	/**
 	 * @return The port on which this adapter listens.
 	 */

spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/SyslogdTests-context.xml

@@ -61,6 +61,7 @@ protected void onInit() {
 		if (this.udpAdapter == null) {
 			this.udpAdapter = new UnicastReceivingChannelAdapter(getPort());
 			this.udpAdapter.setBeanFactory(getBeanFactory());
+			this.udpAdapter.setApplicationEventPublisher(getApplicationEventPublisher());
 		}
 		else {
 			logger.info("The 'UdpSyslogReceivingChannelAdapter' overrides an 'outputChannel' " +

spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/SyslogdTests.java

@@ -77,6 +77,7 @@ public void testUdp() throws Exception {
 		factory.setPort(0);
 		factory.setOutputChannel(outputChannel);
 		factory.setBeanFactory(mock());
+		factory.setApplicationEventPublisher(mock());
 		factory.afterPropertiesSet();
 		factory.start();
 		UnicastReceivingChannelAdapter server = TestUtils.getPropertyValue(factory, "syslogAdapter.udpAdapter",
@@ -150,6 +151,7 @@ public void testAsMapFalse() throws Exception {
 		PollableChannel outputChannel = new QueueChannel();
 		factory.setOutputChannel(outputChannel);
 		factory.setBeanFactory(mock());
+		factory.setApplicationEventPublisher(mock());
 		factory.afterPropertiesSet();
 		factory.start();
 		UnicastReceivingChannelAdapter server = TestUtils.getPropertyValue(factory, "syslogAdapter.udpAdapter",
@@ -191,10 +193,12 @@ public void testTcpRFC5424() throws Exception {
 			return null;
 		}).when(publisher).publishEvent(any(ApplicationEvent.class));
 		factory.setBeanFactory(getBeanFactory());
+		factory.setApplicationEventPublisher(publisher);
 		AbstractServerConnectionFactory connectionFactory = new TcpNioServerConnectionFactory(0);
 		connectionFactory.setBeanFactory(getBeanFactory());
 		connectionFactory.setDeserializer(new RFC6587SyslogDeserializer());
 		connectionFactory.setApplicationEventPublisher(publisher);
+		connectionFactory.afterPropertiesSet();
 		factory.setConnectionFactory(connectionFactory);
 		factory.setConverter(new RFC5424MessageConverter());
 		factory.afterPropertiesSet();
@@ -239,11 +243,12 @@ public void testUdpRFC5424() throws Exception {
 		PollableChannel outputChannel = new QueueChannel();
 		factory.setOutputChannel(outputChannel);
 		factory.setConverter(new RFC5424MessageConverter());
+		factory.setBeanFactory(mock());
+		factory.setApplicationEventPublisher(mock());
 		factory.afterPropertiesSet();
 		factory.start();
 		UnicastReceivingChannelAdapter server = TestUtils.getPropertyValue(factory, "syslogAdapter.udpAdapter",
 				UnicastReceivingChannelAdapter.class);
-		server.setBeanFactory(mock());
 		TestingUtilities.waitListening(server, null);
 		UdpSyslogReceivingChannelAdapter adapter = (UdpSyslogReceivingChannelAdapter) factory.getObject();
 		byte[] buf = ("<14>1 2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA - " +