Merge branch '2.13' into 2.14

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/perf/ReadPerfBaseBasicJackson.java

@@ -47,11 +47,11 @@ protected ReadPerfBaseBasicJackson(Class<T> type,
     @BenchmarkMode(Mode.Throughput)
     @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
-    public void readPojoMediaItem(Blackhole bh, AuxStateSize size)
+    public void readPojoMediaItem(Blackhole bh/*, AuxStateSize size*/)
         throws Exception
     {
         final byte[] input = MINIMAL_CONV.mediaItemAsBytes();
-        size.set(input.length);
+//        size.set(input.length);
         bh.consume(read(input, MEDIA_ITEM_READER));
     }
 

src/main/java/com/fasterxml/jackson/perf/ReadPerfTestBasic.java

@@ -4,6 +4,6 @@
 
 public interface ReadPerfTestBasic
 {
-    public void readPojoMediaItem(Blackhole bh, AuxStateSize size)
+    public void readPojoMediaItem(Blackhole bh/*, AuxStateSize size*/)
         throws Exception;
 }

src/main/java/com/fasterxml/jackson/perf/json/JacksonJrStdReadVanilla.java

@@ -35,8 +35,8 @@ public JacksonJrStdReadVanilla() { }
 
     @Benchmark
     @Override
-    public void readPojoMediaItem(Blackhole bh, AuxStateSize size) throws Exception {
-        size.set(_mediaItemBytes.length);
+    public void readPojoMediaItem(Blackhole bh/*, AuxStateSize size*/) throws Exception {
+        //size.set(_mediaItemBytes.length);
         bh.consume(read(_mediaItemBytes));
     }
 

src/main/java/com/fasterxml/jackson/perf/json/JacksonJrWastefulReadVanilla.java

@@ -32,9 +32,9 @@ public JacksonJrWastefulReadVanilla() {
     }
 
     @Override
-    public void readPojoMediaItem(Blackhole bh, AuxStateSize size) throws Exception {
+    public void readPojoMediaItem(Blackhole bh/*, AuxStateSize size*/) throws Exception {
         final byte[] input = MINIMAL_CONV.mediaItemAsBytes();
-        size.set(input.length);
+//        size.set(input.length);
         bh.consume(read(input));
     }
 

src/main/java/com/fasterxml/jackson/perf/json/JsonStringReadVanilla.java

@@ -58,9 +58,9 @@ protected Object read(String input, ObjectReader reader) throws IOException {
     @Benchmark
     @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
-    public void readPojoMediaItem(Blackhole bh, AuxStateSize size) throws Exception {
+    public void readPojoMediaItem(Blackhole bh/*, AuxStateSize size*/) throws Exception {
         final String input = _converter.mediaItemAsString();
-        size.set(input.length());
+//        size.set(input.length());
         bh.consume(read(input, MEDIA_ITEM_READER));
     }
 

src/main/java/com/fasterxml/jackson/perf/json/JsonWastefulReadVanilla.java

@@ -37,9 +37,9 @@ public JsonWastefulReadVanilla() {
     }
 
     @Override
-    public void readPojoMediaItem(Blackhole bh, AuxStateSize size) throws Exception {
+    public void readPojoMediaItem(Blackhole bh/*, AuxStateSize size*/) throws Exception {
         final String input = MINIMAL_CONV.mediaItemAsString();
-        size.set(input.length());
+//        size.set(input.length());
         bh.consume(read(input));
     }