File tree Expand file tree Collapse file tree 4 files changed +9
-8
lines changed
spring-integration-core/src/main/java/org/springframework/integration/support/json
spring-integration-http/src/main/java/org/springframework/integration/http/inbound
spring-integration-ip/src/main/java/org/springframework/integration/ip Expand file tree Collapse file tree 4 files changed +9
-8
lines changed Original file line number Diff line number Diff line change 27
27
*/
28
28
public final class JacksonPresent {
29
29
30
- private static final ClassLoader classLoader = JacksonJsonUtils .class .getClassLoader ();
30
+ private static final ClassLoader classLoader = JacksonPresent .class .getClassLoader ();
31
31
32
32
private static final boolean jackson2Present =
33
33
ClassUtils .isPresent ("com.fasterxml.jackson.databind.ObjectMapper" , classLoader ) &&
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2017 the original author or authors.
2
+ * Copyright 2017-2018 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
45
45
* with basic properties.
46
46
*
47
47
* @author Artem Bilan
48
+ * @author Gary Russell
48
49
*
49
50
* @since 5.0
50
51
*/
51
52
public class BaseHttpInboundEndpoint extends MessagingGatewaySupport implements OrderlyShutdownCapable {
52
53
53
54
protected static final boolean jaxb2Present = ClassUtils .isPresent ("javax.xml.bind.Binder" ,
54
- HttpRequestHandlingEndpointSupport .class .getClassLoader ());
55
+ BaseHttpInboundEndpoint .class .getClassLoader ());
55
56
56
57
protected static final boolean romeToolsPresent = ClassUtils .isPresent ("com.rometools.rome.feed.atom.Feed" ,
57
- HttpRequestHandlingEndpointSupport .class .getClassLoader ());
58
+ BaseHttpInboundEndpoint .class .getClassLoader ());
58
59
59
60
protected static final List <HttpMethod > nonReadableBodyHttpMethods =
60
61
Arrays .asList (HttpMethod .GET , HttpMethod .HEAD , HttpMethod .OPTIONS );
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ public class UdpServerListeningEvent extends IpIntegrationEvent {
32
32
33
33
private final int port ;
34
34
35
- public UdpServerListeningEvent (UnicastReceivingChannelAdapter adapter , int port ) {
35
+ public UdpServerListeningEvent (Object adapter , int port ) {
36
36
super (adapter );
37
37
this .port = port ;
38
38
}
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2016 the original author or authors.
2
+ * Copyright 2002-2018 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
16
16
17
17
package org .springframework .integration .ip .util ;
18
18
19
+ import org .springframework .integration .ip .AbstractInternetProtocolReceivingChannelAdapter ;
19
20
import org .springframework .integration .ip .tcp .connection .AbstractConnectionFactory ;
20
21
import org .springframework .integration .ip .tcp .connection .AbstractServerConnectionFactory ;
21
- import org .springframework .integration .ip .udp .UnicastReceivingChannelAdapter ;
22
22
23
23
/**
24
24
* Convenience class providing methods for testing IP components.
@@ -73,7 +73,7 @@ public static void waitListening(AbstractServerConnectionFactory serverConnectio
73
73
* @param delay How long to wait in milliseconds; default 10000 (10 seconds) if null.
74
74
* @throws IllegalStateException If the server does not start listening in time.
75
75
*/
76
- public static void waitListening (UnicastReceivingChannelAdapter adapter , Long delay )
76
+ public static void waitListening (AbstractInternetProtocolReceivingChannelAdapter adapter , Long delay )
77
77
throws IllegalStateException {
78
78
if (delay == null ) {
79
79
delay = 100L ;
You can’t perform that action at this time.
0 commit comments