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

Use putIfAbsent in Netty5HeadersAdapter 

See gh-30343
This commit is contained in:
divcon 2023-04-16 10:41:32 +09:00 committed by Stephane Nicoll
parent 5deab3afd0
commit f79d145b4c
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/main/java/org/springframework/http/client/reactive/Netty5HeadersAdapter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 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.
@ -91,11 +91,9 @@ class Netty5HeadersAdapter implements MultiValueMap<String, String> {
@Override @Override
public Map<String, String> toSingleValueMap() { public Map<String, String> toSingleValueMap() {
Map<String, String> singleValueMap = CollectionUtils.newLinkedHashMap(this.headers.size()); Map<String, String> singleValueMap = CollectionUtils.newLinkedHashMap(this.headers.size());
this.headers.forEach(entry -> { this.headers.forEach(entry ->
if (!singleValueMap.containsKey(entry.getKey())) { singleValueMap.putIfAbsent(entry.getKey().toString(), entry.getValue().toString())
singleValueMap.put(entry.getKey().toString(), entry.getValue().toString()); );
}
});
return singleValueMap; return singleValueMap;
} }

10
spring-web/src/main/java/org/springframework/http/server/reactive/Netty5HeadersAdapter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 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.
@ -89,11 +89,9 @@ final class Netty5HeadersAdapter implements MultiValueMap<String, String> {
@Override @Override
public Map<String, String> toSingleValueMap() { public Map<String, String> toSingleValueMap() {
Map<String, String> singleValueMap = CollectionUtils.newLinkedHashMap(this.headers.size()); Map<String, String> singleValueMap = CollectionUtils.newLinkedHashMap(this.headers.size());
this.headers.forEach(entry -> { this.headers.forEach(entry ->
if (!singleValueMap.containsKey(entry.getKey())) { singleValueMap.putIfAbsent(entry.getKey().toString(), entry.getValue().toString())
singleValueMap.put(entry.getKey().toString(), entry.getValue().toString()); );
}
});
return singleValueMap; return singleValueMap;
} }