From 2853da4adfdc0456692b7f7b8c806274f384b80e Mon Sep 17 00:00:00 2001 From: joohyukkim Date: Thu, 18 May 2023 21:18:47 +0900 Subject: [PATCH] Squashed commit of the following: commit f083348b875b94ecf44131853a829d3fc0f0e53c Merge: 6091c4b8db 3291911aa2 Author: Tatu Saloranta Date: Tue May 16 14:53:20 2023 -0700 Merge branch '2.15' into 2.16 commit 3291911aa2e6ea00880d789e3643a13962d214cf Author: Tatu Saloranta Date: Tue May 16 14:49:51 2023 -0700 Back to snapshot dep commit 05472aedffc71129ca34f204f9c431875b7c8ae5 Author: Tatu Saloranta Date: Tue May 16 14:47:37 2023 -0700 [maven-release-plugin] prepare for next development iteration commit 6e3732557c3fcd45687a9e2780165f5adaa2c41f Author: Tatu Saloranta Date: Tue May 16 14:47:34 2023 -0700 [maven-release-plugin] prepare release jackson-databind-2.15.1 commit 3d9dd34890ad46bb6e6089dac2895c13647ae9ac Author: Tatu Saloranta Date: Tue May 16 14:34:13 2023 -0700 2.15.1 release commit 6091c4b8db30a51b470b880756666e99144934ee Merge: d2ae3a2e27 55d87cfb22 Author: Tatu Saloranta Date: Tue May 16 12:38:57 2023 -0700 Merge branch '2.15' into 2.16 commit 55d87cfb2271ebe507bdf1286839b916bd0c1c80 Merge: a7e17adf04 c7b6c64da5 Author: Tatu Saloranta Date: Tue May 16 12:38:24 2023 -0700 Merge branch '2.14' into 2.15 commit c7b6c64da52761549e4585cf725e4cbf9d0464af Author: Tatu Saloranta Date: Tue May 16 12:35:44 2023 -0700 Fix #3882 (JsonNode.withArray() fail) commit d2ae3a2e271a7dc6d22d41ff1023f5981fa9b0bf Author: Tatu Saloranta Date: Mon May 15 21:06:11 2023 -0700 manual merge of pom.xml (test) change commit 7ddce076b458dca09bd69570ea734d68a6689905 Merge: a3bb1b90ff a7e17adf04 Author: Tatu Saloranta Date: Mon May 15 21:02:46 2023 -0700 Merge branch '2.15' into 2.16 commit a7e17adf04c0bf2c548471c4b7679f3d9399e097 Author: Tatu Saloranta Date: Mon May 15 21:01:49 2023 -0700 Add Junit 5 test dependency commit a3bb1b90ff6753164b5c6c61f6842dc7d382d081 Merge: a3b231cdd5 8a8ba5a1f3 Author: Tatu Saloranta Date: Mon May 15 18:13:22 2023 -0700 Merge branch '2.15' into 2.16 commit 8a8ba5a1f3ea91cf93d22f8623f451a628efc49e Author: Kim, Joo Hyuk Date: Tue May 16 10:13:07 2023 +0900 Update JavaDoc of JsonAppend. (#3933) commit a3b231cdd595a879bbb667f43ba7102056545d7f Author: Tatu Saloranta Date: Mon May 15 15:38:40 2023 -0700 Update release notes wrt #3928 commit 40c97391ba61773922c6d6f8ea21e5fe59c20cf6 Author: PJ Fanning Date: Mon May 15 23:32:27 2023 +0100 Json property affects Record field serialization order (#3929) commit 8fcf9efaa445cd2767887d1a78ec68058cd9de7b Merge: e9db4b3556 e5bdcfb317 Author: Tatu Saloranta Date: Sun May 14 17:08:35 2023 -0700 Merge branch '2.15' into 2.16 commit e5bdcfb31771c1e35ed69b1fc49e84ab5d1ac023 Author: Kim, Joo Hyuk Date: Mon May 15 09:06:35 2023 +0900 Remove hard-coded `StreamReadConstraints` test variables to isolate change in `jackson-core` itself (#3930) commit e9db4b3556db3d19c6f6bd5ae1e877c399716d7d Author: Piotr Findeisen Date: Mon May 15 02:04:42 2023 +0200 Fix typo in USE_GETTERS_AS_SETTERS description (#3931) commit d8d4cb69e9046df937788c8edd765888562aaf64 Author: Tatu Saloranta Date: Sat May 13 20:15:45 2023 -0700 Sync tests wrt error messages commit c1b4aad3ff05db8312332e427c086ad0a4d40f20 Merge: 67103c2881 6f81a4ed90 Author: Tatu Saloranta Date: Sat May 13 20:04:42 2023 -0700 Merge branch '2.15' into 2.16 commit 6f81a4ed9064a37fd518a1d310cf7509ae7a043f Author: Tatu Saloranta Date: Sat May 13 20:02:20 2023 -0700 Minor change to align with higher max string value length limit commit 67103c2881aa506ebceb25824becac5b80a4f86a Author: Tatu Saloranta Date: Sat May 6 09:44:18 2023 -0700 Clean up attic... commit cfe8e975f37bd182e9616fb4eb931ebebf8369f8 Author: Muhammad Khalikov <55890311+mukham12@users.noreply.github.com> Date: Sat May 6 12:43:35 2023 -0400 Fix a few typos in documentation (#3919) commit df541d3c74133496454dd9bfccc404b54a0faea6 Author: Kim, Joo Hyuk Date: Sat May 6 12:32:13 2023 +0900 Improve and fix JavaDocs for Jackson 2.15 (#3917) commit d44e014015914c4f721dd33e6c43e25c0c9625fc Merge: 924152d111 c8c7d395dd Author: Tatu Saloranta Date: Fri May 5 09:36:27 2023 -0700 Merge branch '2.15' into 2.16 commit c8c7d395dddb07bb2e2d098c6232dd0ae35dd4a3 Merge: a7a8a8036a d47d1b6429 Author: Tatu Saloranta Date: Fri May 5 09:36:21 2023 -0700 Merge branch '2.14' into 2.15 commit d47d1b642931246770ec67c4a98ad6aacc0f7d7d Author: Tatu Saloranta Date: Fri May 5 09:34:29 2023 -0700 Back to snapshot dep commit 6f3d20f8f3165a375eb5d44105c18285b4132faf Author: Tatu Saloranta Date: Fri May 5 09:31:43 2023 -0700 [maven-release-plugin] prepare for next development iteration commit 8cdba2177a411c9dfc8949bbf0f23b4fa8ef5d8d Author: Tatu Saloranta Date: Fri May 5 09:31:40 2023 -0700 [maven-release-plugin] prepare release jackson-databind-2.14.3 commit 2bd50de31a25a419e63b6f4350709999dbafe758 Author: Tatu Saloranta Date: Fri May 5 09:09:17 2023 -0700 Prepare for 2.14.3 release commit 924152d1112e594e8c6bb5644efd8ecd3b4dda91 Merge: 774ddb8387 a7a8a8036a Author: Tatu Saloranta Date: Thu May 4 14:00:26 2023 -0700 Merge branch '2.15' into 2.16 commit a7a8a8036a843dd1b2022561bb1376575b180419 Author: Tatu Saloranta Date: Thu May 4 14:00:13 2023 -0700 ... commit 774ddb83872892f2442bc209d9b57036694cece2 Merge: f8477455d1 ad308b426a Author: Tatu Saloranta Date: Thu May 4 13:57:18 2023 -0700 Merge branch '2.15' into 2.16 commit ad308b426a253b0d3a8062b22abe1c2191f789c0 Author: Tatu Saloranta Date: Thu May 4 13:55:48 2023 -0700 Update release notes wrt #3897 commit 1fa2d861ecd8595f528db579075c1933cd38495b Author: Sim Yih Tsern Date: Fri May 5 04:52:30 2023 +0800 Record constructor with single write-only parameter should result in properties-based creator, to fix #3897. (#3910) commit f8477455d1e749791bb77c2f6ab455aae0f2f5af Merge: f3c60eddf7 ee3b89aed9 Author: Tatu Saloranta Date: Thu May 4 11:13:22 2023 -0700 Merge branch '2.16' of github.com:FasterXML/jackson-databind into 2.16 commit f3c60eddf7c0bbb690811cccbfb9313fd7f39aaf Merge: 23603ea11b 75475913f0 Author: Tatu Saloranta Date: Thu May 4 11:13:15 2023 -0700 Merge branch '2.15' into 2.16 commit 75475913f0e49065652b3e52a2a8bff54d86fca5 Author: Tatu Saloranta Date: Thu May 4 11:12:53 2023 -0700 Mark #3895 as fixed (due to another PR/issue) commit ee3b89aed9b3fbba560a92e78bc58c53ab5c2962 Author: ChangYong Date: Fri May 5 02:09:33 2023 +0900 Fix incorrect comment (#3916) --- .../fasterxml/jackson/databind/AnnotationIntrospector.java | 4 ++-- .../jackson/databind/deser/BasicDeserializerFactory.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java b/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java index 18f0f02ae6..fcfd0b5164 100644 --- a/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java +++ b/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java @@ -59,7 +59,7 @@ public enum Type { * Usually this can be defined by using * {@link com.fasterxml.jackson.annotation.JsonManagedReference} */ - MANAGED_REFERENCE + MANAGED_REFERENCE, /** * Reference property that Jackson manages by suppressing it during serialization, @@ -67,7 +67,7 @@ public enum Type { * Usually this can be defined by using * {@link com.fasterxml.jackson.annotation.JsonBackReference} */ - ,BACK_REFERENCE + BACK_REFERENCE ; } diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java index 510984a8a8..3f3aff61b7 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java @@ -1031,6 +1031,10 @@ private boolean _checkIfCreatorPropertyBased(BeanDescription beanDesc, return true; } } + // [databind#3897]: Record canonical constructor will have implicitly named propDef + if (!propDef.isExplicitlyNamed() && beanDesc.isRecordType()) { + return true; + } } // in absence of everything else, default to delegating return false;