Skip to content

Commit 3bd4930

Browse files
garyrussellartembilan
authored andcommitted
Fix UDP Tangles
- Class tangle in new event - Package tangle udp <-> util * Fix JacksonJsonUtils class tangle * Fix HTTP class tangle
1 parent 90a751e commit 3bd4930

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonPresent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
public final class JacksonPresent {
2929

30-
private static final ClassLoader classLoader = JacksonJsonUtils.class.getClassLoader();
30+
private static final ClassLoader classLoader = JacksonPresent.class.getClassLoader();
3131

3232
private static final boolean jackson2Present =
3333
ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&

spring-integration-http/src/main/java/org/springframework/integration/http/inbound/BaseHttpInboundEndpoint.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 the original author or authors.
2+
* Copyright 2017-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -45,16 +45,17 @@
4545
* with basic properties.
4646
*
4747
* @author Artem Bilan
48+
* @author Gary Russell
4849
*
4950
* @since 5.0
5051
*/
5152
public class BaseHttpInboundEndpoint extends MessagingGatewaySupport implements OrderlyShutdownCapable {
5253

5354
protected static final boolean jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder",
54-
HttpRequestHandlingEndpointSupport.class.getClassLoader());
55+
BaseHttpInboundEndpoint.class.getClassLoader());
5556

5657
protected static final boolean romeToolsPresent = ClassUtils.isPresent("com.rometools.rome.feed.atom.Feed",
57-
HttpRequestHandlingEndpointSupport.class.getClassLoader());
58+
BaseHttpInboundEndpoint.class.getClassLoader());
5859

5960
protected static final List<HttpMethod> nonReadableBodyHttpMethods =
6061
Arrays.asList(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS);

spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UdpServerListeningEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class UdpServerListeningEvent extends IpIntegrationEvent {
3232

3333
private final int port;
3434

35-
public UdpServerListeningEvent(UnicastReceivingChannelAdapter adapter, int port) {
35+
public UdpServerListeningEvent(Object adapter, int port) {
3636
super(adapter);
3737
this.port = port;
3838
}

spring-integration-ip/src/main/java/org/springframework/integration/ip/util/TestingUtilities.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
1616

1717
package org.springframework.integration.ip.util;
1818

19+
import org.springframework.integration.ip.AbstractInternetProtocolReceivingChannelAdapter;
1920
import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory;
2021
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
21-
import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter;
2222

2323
/**
2424
* Convenience class providing methods for testing IP components.
@@ -73,7 +73,7 @@ public static void waitListening(AbstractServerConnectionFactory serverConnectio
7373
* @param delay How long to wait in milliseconds; default 10000 (10 seconds) if null.
7474
* @throws IllegalStateException If the server does not start listening in time.
7575
*/
76-
public static void waitListening(UnicastReceivingChannelAdapter adapter, Long delay)
76+
public static void waitListening(AbstractInternetProtocolReceivingChannelAdapter adapter, Long delay)
7777
throws IllegalStateException {
7878
if (delay == null) {
7979
delay = 100L;

0 commit comments

Comments
 (0)