SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge cleanup

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-02-09 14:41:40 +01:00
parent 37e974d019
commit fc1e02022e
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/message/MessageUtils.java
View File

@@ -16,11 +16,11 @@
package org.springframework.cloud.function.context.message; package org.springframework.cloud.function.context.message;
<<<<<<< HEAD
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TreeMap;
import org.springframework.cloud.function.core.FluxWrapper; import org.springframework.cloud.function.core.FluxWrapper;
import org.springframework.cloud.function.core.Isolated; import org.springframework.cloud.function.core.Isolated;
@@ -28,12 +28,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
=======
import java.util.Map;
import java.util.TreeMap;
import org.springframework.messaging.Message;
>>>>>>> 8f15b9ba... GH-804 Add support for case-insensitive Cloud Event determination
/** /**
* @author Dave Syer * @author Dave Syer
@@ -132,8 +127,9 @@ public abstract class MessageUtils {
return MessageBuilder.withPayload(payload).copyHeaders(headers).build(); return MessageBuilder.withPayload(payload).copyHeaders(headers).build();
} }
/** /**
* Returns (payload, headers) structure identical to `message` while substituting headers with case insensitive map. * Returns (payload, headers) structure identical to `message` while
* substituting headers with case insensitive map.
*/ */
public static MessageStructureWithCaseInsensitiveHeaderKeys toCaseInsensitiveHeadersStructure(Message<?> message) { public static MessageStructureWithCaseInsensitiveHeaderKeys toCaseInsensitiveHeadersStructure(Message<?> message) {
return new MessageStructureWithCaseInsensitiveHeaderKeys(message); return new MessageStructureWithCaseInsensitiveHeaderKeys(message);