Skip to content

Commit 46de930

Browse files
committed
Update deprecated ctor so that it will only establish default codec
Per code review. Thanks!
1 parent 34e224a commit 46de930

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

spring-integration-core/src/main/java/org/springframework/integration/codec/CompositeCodec.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public CompositeCodec(Map<Class<?>, Codec> delegates, Codec defaultCodec) {
4949
*/
5050
@Deprecated(since = "7.0", forRemoval = true)
5151
public CompositeCodec(Codec defaultCodec) {
52-
this(Map.of(), defaultCodec);
52+
this.defaultCodec = defaultCodec;
53+
this.delegates = Map.of();
5354
}
5455

5556
@Override
@@ -79,11 +80,7 @@ public <T> T decode(byte[] bytes, Class<T> type) throws IOException {
7980

8081
private Codec findDelegate(Class<?> type) {
8182
Class<?> clazz = ClassUtils.findClosestMatch(type, this.delegates.keySet(), false);
82-
Codec codec = this.delegates.get(clazz);
83-
if (codec == null) {
84-
codec = this.defaultCodec;
85-
}
86-
return codec;
83+
return clazz == null ? this.defaultCodec : this.delegates.getOrDefault(clazz, this.defaultCodec);
8784
}
8885

8986
}

0 commit comments

Comments
 (0)