Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UDP Tangles

Browse Source 
- Class tangle in new event
- Package tangle udp <-> util

* Fix JacksonJsonUtils class tangle

* Fix HTTP class tangle
This commit is contained in:
Gary Russell
2018-02-01 15:12:53 -05:00
committed by Artem Bilan
parent 90a751e69d
commit 3bd4930813
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ import org.springframework.util.ClassUtils;
*/
public final class JacksonPresent {
private static final ClassLoader classLoader = JacksonJsonUtils.class.getClassLoader();
private static final ClassLoader classLoader = JacksonPresent.class.getClassLoader();
private static final boolean jackson2Present =
ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&

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

@@ -1,5 +1,5 @@
/*
* Copyright 2017 the original author or authors.
* Copyright 2017-2018 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.
@@ -45,16 +45,17 @@ import org.springframework.util.CollectionUtils;
* with basic properties.
*
* @author Artem Bilan
* @author Gary Russell
*
* @since 5.0
*/
public class BaseHttpInboundEndpoint extends MessagingGatewaySupport implements OrderlyShutdownCapable {
protected static final boolean jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder",
HttpRequestHandlingEndpointSupport.class.getClassLoader());
BaseHttpInboundEndpoint.class.getClassLoader());
protected static final boolean romeToolsPresent = ClassUtils.isPresent("com.rometools.rome.feed.atom.Feed",
HttpRequestHandlingEndpointSupport.class.getClassLoader());
BaseHttpInboundEndpoint.class.getClassLoader());
protected static final List<HttpMethod> nonReadableBodyHttpMethods =
Arrays.asList(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS);

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

@@ -32,7 +32,7 @@ public class UdpServerListeningEvent extends IpIntegrationEvent {
private final int port;
public UdpServerListeningEvent(UnicastReceivingChannelAdapter adapter, int port) {
public UdpServerListeningEvent(Object adapter, int port) {
super(adapter);
this.port = port;
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 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.
@@ -16,9 +16,9 @@
package org.springframework.integration.ip.util;
import org.springframework.integration.ip.AbstractInternetProtocolReceivingChannelAdapter;
import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter;
/**
* Convenience class providing methods for testing IP components.
@@ -73,7 +73,7 @@ public final class TestingUtilities {
* @param delay How long to wait in milliseconds; default 10000 (10 seconds) if null.
* @throws IllegalStateException If the server does not start listening in time.
*/
public static void waitListening(UnicastReceivingChannelAdapter adapter, Long delay)
public static void waitListening(AbstractInternetProtocolReceivingChannelAdapter adapter, Long delay)
throws IllegalStateException {
if (delay == null) {
delay = 100L;