From 675e0b94c13e4a188a8b8a793f98593c5c897765 Mon Sep 17 00:00:00 2001
From: wpp <396859442@qq.com>
Date: Fri, 29 Jul 2022 13:29:07 +0800
Subject: [PATCH 1/2] Fix typo in Javadoc of AbstractEncoder

See gh-28885
---
 .../java/org/springframework/core/codec/AbstractEncoder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
index 5a2633d773..ac6fe31fdb 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
@@ -27,7 +27,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.MimeType;
 
 /**
- * Abstract base class for {@link Decoder} implementations.
+ * Abstract base class for {@link Encoder} implementations.
  *
  * @author Sebastien Deleuze
  * @author Arjen Poutsma

From aef4b0ec5a63874710b362c05e99d1c63b098e59 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 29 Jul 2022 09:29:58 +0200
Subject: [PATCH 2/2] Upgrade copyright year of changed file

See gh-28885
---
 .../java/org/springframework/core/codec/AbstractEncoder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
index ac6fe31fdb..49915e02a7 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.