root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

MetadataEncoder expands vars correctly 

Closes gh-24656
This commit is contained in:
Rossen Stoyanchev 2020-03-10 13:59:19 +00:00
parent 0dc1c7eb8b
commit 4aedf2ea13
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -51,7 +51,7 @@ import org.springframework.util.ObjectUtils;
final class MetadataEncoder { final class MetadataEncoder {
/** For route variable replacement. */ /** For route variable replacement. */
private static final Pattern VARS_PATTERN = Pattern.compile("\\{([^/]+?)}"); private static final Pattern VARS_PATTERN = Pattern.compile("\\{(.+?)}");
private static final Object NO_VALUE = new Object(); private static final Object NO_VALUE = new Object();
@ -113,6 +113,7 @@ final class MetadataEncoder {
matcher.appendReplacement(sb, value); matcher.appendReplacement(sb, value);
index++; index++;
} }
matcher.appendTail(sb);
return sb.toString(); return sb.toString();
} }

6
spring-messaging/src/test/java/org/springframework/messaging/rsocket/MetadataEncoderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -131,11 +131,11 @@ public class MetadataEncoderTests {
public void routeWithVars() { public void routeWithVars() {
DataBuffer buffer = DataBuffer buffer =
new MetadataEncoder(MimeTypeUtils.TEXT_PLAIN, this.strategies) new MetadataEncoder(MimeTypeUtils.TEXT_PLAIN, this.strategies)
.route("a.{b}.{c}", "BBB", "C.C.C") .route("a.{b}.{c}.d", "BBB", "C.C.C")
.encode() .encode()
.block(); .block();
assertThat(dumpString(buffer)).isEqualTo("a.BBB.C%2EC%2EC"); assertThat(dumpString(buffer)).isEqualTo("a.BBB.C%2EC%2EC.d");
} }
@Test @Test