Revert "Fix #4595: merging of PropertyName.NO_NAME by AnnotationIntro…

…spectorPair" This reverts commit d7fb59b.
FasterXML · Jun 22, 2024 · 8e22209 · 8e22209
1 parent d7fb59b
commit 8e22209
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -16,8 +16,6 @@ Project: jackson-databind
 #4577: Cannot deserialize value of type `java.math.BigDecimal` from
    String "3." (not a valid representation)
  (reported by @dmelisso)
-#4595: No way to explicitly disable wrapping in custom annotation processor
- (reported by @SimonCockx)
 
 2.17.1 (04-May-2024)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/PropertyName.java b/src/main/java/com/fasterxml/jackson/databind/PropertyName.java
@@ -82,9 +82,6 @@ protected Object readResolve() {
                 return NO_NAME;
             }
             */
-            // 22-Jun-2024, tatu: This is hopeful not problematic as marker
-            //   value should only be provided by AnnotationIntrospector etc,
-            //   but not stored in Deserializer/Serializer instances.
         }
         return this;
     }
@@ -130,10 +127,6 @@ public static PropertyName merge(PropertyName name1, PropertyName name2) {
         if (name2 == null) {
             return name1;
         }
-        // 22-Jun-2024, tatu: [databind#4595] Should not merge NO_NAME
-        if (name1 == NO_NAME) {
-            return name1;
-        }
         String ns = _nonEmpty(name1._namespace, name2._namespace);
         String simple = _nonEmpty(name1._simpleName, name2._simpleName);