Merge branch '2.16'

FasterXML · Aug 19, 2023 · ca16483 · ca16483
2 parents 33de83f + 7f85d4a
commit ca16483
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/tools/jackson/databind/introspect/AnnotatedMethodCollector.java b/src/main/java/tools/jackson/databind/introspect/AnnotatedMethodCollector.java
@@ -73,12 +73,10 @@ AnnotatedMethodMap collect(TypeResolutionContext tc,
                 try {
                     // And with that, we can generate it appropriately
                     Method m = Object.class.getDeclaredMethod(k.getName());
-                    if (m != null) {
-                        MethodBuilder b = entry.getValue();
-                        b.annotations = collectDefaultAnnotations(b.annotations,
-                                m.getDeclaredAnnotations());
-                        b.method = m;
-                   }
+                    MethodBuilder b = entry.getValue();
+                    b.annotations = collectDefaultAnnotations(b.annotations,
+                            m.getDeclaredAnnotations());
+                    b.method = m;
                 } catch (Exception e) { }
             }
         }

diff --git a/src/main/java/tools/jackson/databind/util/StdDateFormat.java b/src/main/java/tools/jackson/databind/util/StdDateFormat.java
@@ -273,7 +273,7 @@ public void setLenient(boolean enabled) {
     @Override
     public boolean isLenient() {
         // default is, I believe, true
-        return (_lenient == null) || _lenient.booleanValue();
+        return (_lenient == null) || _lenient;
     }
 
     /**

diff --git a/src/main/java/tools/jackson/databind/util/TokenBuffer.java b/src/main/java/tools/jackson/databind/util/TokenBuffer.java
@@ -487,11 +487,11 @@ public void serialize(JsonGenerator gen) throws JacksonException
                 {
                     Object n = segment.get(ptr);
                     if (n instanceof Double) {
-                        gen.writeNumber(((Double) n).doubleValue());
+                        gen.writeNumber((Double) n);
                     } else if (n instanceof BigDecimal) {
                         gen.writeNumber((BigDecimal) n);
                     } else if (n instanceof Float) {
-                        gen.writeNumber(((Float) n).floatValue());
+                        gen.writeNumber((Float) n);
                     } else if (n == null) {
                         gen.writeNull();
                     } else if (n instanceof String) {
@@ -2151,8 +2151,7 @@ public int rawType(int index)
             if (index > 0) {
                 l >>= (index << 2);
             }
-            int ix = ((int) l) & 0xF;
-            return ix;
+            return ((int) l) & 0xF;
         }
 
         public Object get(int index) {