Merge branch '2.10' of github.com:FasterXML/jackson-databind into 2.10

cowtowncoder · cowtowncoder · commit 21c110325cfb · 2019-04-24T21:37:26.000-07:00
diff --git a/src/test/java/perf/ManualWritePerfWithUUID.java b/src/test/java/perf/ManualWritePerfWithUUID.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 
-public class ManulWritePerfWithUUID
+public class ManualWritePerfWithUUID
     extends ObjectWriterTestBase<UUIDFast, UUIDSlow>
 {
     @Override
@@ -27,7 +27,7 @@ public static void main(String[] args) throws Exception
         for (int i = 0; i < uuids.length; ++i) {
             uuids[i] = UUID.randomUUID();
         }
-        new ManulWritePerfWithUUID().test(new JsonMapper(),
+        new ManualWritePerfWithUUID().test(new JsonMapper(),
                 "faster-UUID", new UUIDFast(uuids), UUIDFast.class,
                 "JDK-UUID", new UUIDSlow(uuids), UUIDSlow.class);
     }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`import com.fasterxml.jackson.databind.json.JsonMapper;`
`12`	`12`	`import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;`
`13`	`13`
`14`		`-public class ManulWritePerfWithUUID`
	`14`	`+public class ManualWritePerfWithUUID`
`15`	`15`	`extends ObjectWriterTestBase<UUIDFast, UUIDSlow>`
`16`	`16`	`{`
`17`	`17`	`@Override`
`@@ -27,7 +27,7 @@ public static void main(String[] args) throws Exception`
`27`	`27`	`for (int i = 0; i < uuids.length; ++i) {`
`28`	`28`	`uuids[i] = UUID.randomUUID();`
`29`	`29`	`}`
`30`		`- new ManulWritePerfWithUUID().test(new JsonMapper(),`
	`30`	`+ new ManualWritePerfWithUUID().test(new JsonMapper(),`
`31`	`31`	`"faster-UUID", new UUIDFast(uuids), UUIDFast.class,`
`32`	`32`	`"JDK-UUID", new UUIDSlow(uuids), UUIDSlow.class);`
`33`	`33`	`}`